prefer taskapp timestamps

Author: mgerni

static/js/task.js

@@ -1124,18 +1124,40 @@ $(document).ready(function(){
 $(document).ready(function(){
   $(document).on('click', '#importButton', function(){
     var input = document.getElementById('importInput');
+    var importButton = document.getElementById('importButton');
+    var overwriteTempleTimestamps = document.getElementById('overwriteTempleTimestamps');
     var username = input.value;
     var importConent = document.getElementById('importContent');
 
+    if (importButton) {
+      importButton.disabled = true;
+      importButton.textContent = 'Importing...';
+    }
+
+    var preferTaskappTimestamps = true;
+    if (overwriteTempleTimestamps) {
+      preferTaskappTimestamps = overwriteTempleTimestamps.checked;
+    }
+
     req = $.ajax({
       url : '/collectionlog_import/',
       type : 'POST',
-      data : {username : username}
+      data : {
+        username : username,
+        overwriteTempleTimestamps: preferTaskappTimestamps,
+      }
     });
 
     req.done(function(data) {
       $(importConent).html(data)
     });
+
+    req.fail(function() {
+      if (importButton) {
+        importButton.disabled = false;
+        importButton.textContent = 'Import';
+      }
+    });
   });
 });
 

task_database.py

@@ -662,7 +662,8 @@ def manual_revert_tasks(username, tier, task_id):
 
 
 def update_imported_tasks(username: str, all_tasks: list, username2: str,
-                          recorded_item_ids_by_tier: dict | None = None):
+                          recorded_item_ids_by_tier: dict | None = None,
+                          overwrite_temple_timestamps: bool = True):
     coll = mydb['taskLists']
     include = {'easy', 'medium', 'hard', 'elite'}
     tasks_to_check = []
@@ -761,6 +762,40 @@ def sanitize_recorded_map(value):
     existing_recorded_hard = sanitize_recorded_map(diaries['tiers']['hard'].get('recordedItemIdsByTask', {}))
     existing_recorded_elite = sanitize_recorded_map(diaries['tiers']['elite'].get('recordedItemIdsByTask', {}))
 
+    def existing_completed_date_map(completed_tasks):
+        output = {}
+        for entry in completed_tasks:
+            task_id = entry.get('id')
+            if not task_id:
+                continue
+            completed_date = entry.get('completedDate')
+            if completed_date is None:
+                continue
+            normalized_date = __datetime_to_iso(completed_date)
+            if normalized_date:
+                output[task_id] = normalized_date
+        return output
+
+    existing_completed_dates_easy = existing_completed_date_map(diaries['tiers']['easy'].get('completedTasks', []))
+    existing_completed_dates_medium = existing_completed_date_map(diaries['tiers']['medium'].get('completedTasks', []))
+    existing_completed_dates_hard = existing_completed_date_map(diaries['tiers']['hard'].get('completedTasks', []))
+    existing_completed_dates_elite = existing_completed_date_map(diaries['tiers']['elite'].get('completedTasks', []))
+
+    if overwrite_temple_timestamps:
+        tier_existing_dates = [
+            existing_completed_dates_easy,
+            existing_completed_dates_medium,
+            existing_completed_dates_hard,
+            existing_completed_dates_elite,
+        ]
+        for tier_tasks, tier_date_map in zip(all_tasks, tier_existing_dates):
+            for imported_task in tier_tasks:
+                task_id = imported_task.get('id')
+                if not task_id:
+                    continue
+                if task_id in tier_date_map:
+                    imported_task['completedDate'] = tier_date_map[task_id]
+
     imported_recorded_easy = sanitize_recorded_map(recorded_item_ids_by_tier.get('easy', {}))
     imported_recorded_medium = sanitize_recorded_map(recorded_item_ids_by_tier.get('medium', {}))
     imported_recorded_hard = sanitize_recorded_map(recorded_item_ids_by_tier.get('hard', {}))

taskapp.py

@@ -567,6 +567,8 @@ def collection_log_check():
 def collection_log_import():
     form_data = request.form
     rs_username = form_data['username']
+    overwrite_temple_timestamps_raw = form_data.get('overwriteTempleTimestamps', 'true')
+    overwrite_temple_timestamps = str(overwrite_temple_timestamps_raw).lower() == 'true'
     easy_import_result = check_logs(rs_username, tasklists.list_for_tier('easy'), 'import-recorded')
     medium_import_result = check_logs(rs_username, tasklists.list_for_tier('medium'), 'import-recorded')
     hard_import_result = check_logs(rs_username, tasklists.list_for_tier('hard'), 'import-recorded')
@@ -587,6 +589,7 @@ def collection_log_import():
         all_tasks,
         form_data['username'],
         recorded_item_ids_by_tier,
+        overwrite_temple_timestamps,
     )
 
     return render_template('collection_log_import.html',

templates/temple-sync.html

@@ -38,6 +38,12 @@ <h3>Import from TempleOSRS</h3>
                      </ol>
 
                      <p  class="complete">Once you have ensured your TempleOSRS data is updated/sync'd, enter your Runescape Username and click Import.</p>
+                            <div class="import-input-section" title="When checked TaskApp timestamps will be preferred over TempleOSRS timestamps.">
+                                <label class="complete" for="overwriteTempleTimestamps" style="display:flex; align-items:center; gap:8px; justify-content:center;">
+                                     <input type="checkbox" id="overwriteTempleTimestamps" checked>
+                                     Overwrite Temple timestamps
+                                </label>
+                            </div>
                      <div class="import-input-section">
                         <input class="rc-input" type="text" name="inputText" id="importInput" placeholder="RSN">
                         <button id="importButton" class="rsText button-complete button-green">Import</button>