Integrate session note and tag editing and center progress controls

tests/test_workout_view.py

@@ -120,6 +120,55 @@ class WorkoutViewTests(unittest.TestCase):
         self.assertEqual(response.status_code, 302)
         self.db.execute.assert_not_called()
 
+    def test_session_note_editor_round_trip_keeps_integrated_card(self):
+        import routes.notes as notes
+        text = 'Good energy\nKeep <cues> simple'
+        with patch.object(notes, 'db', self.db), patch.object(notes, '_fetch_workout_note', return_value=text), patch.object(notes, '_update_workout_note_for_person') as save:
+            edit = self.client.get(self.base + '/note/edit?view=session')
+            self.assertIn(b'workout-note-editor', edit.data)
+            # The HTML minifier can unescape RCDATA inside a textarea.
+            self.assertIn(b'Keep <cues> simple</textarea>', edit.data)
+            self.assertIn(b'Save note', edit.data)
+            saved = self.client.put(self.base + '/note?view=session', data={'note': text})
+            save.assert_called_once_with(1, 1, text)
+            self.assertIn(b'workout-note-trigger', saved.data)
+            self.assertIn(b'Good energy<br>Keep &lt;cues> simple', saved.data)
+            self.assertNotIn(b'<textarea', saved.data)
+            canceled = self.client.get(self.base + '/note?view=session')
+            self.assertIn(b'workout-note-preview', canceled.data)
+            legacy = self.client.get(self.base + '/note')
+            self.assertNotIn(b'workout-note-card', legacy.data)
+
+    def test_tags_return_updated_controls_after_select_clear_and_create(self):
+        import routes.tags as tags
+        tag = dict(tag_id=12, tag_name='Push', is_selected=True)
+
+        def execute(query, args=(), **kwargs):
+            if 'SELECT person_id' in query:
+                return {'person_id': 1}
+            if 'SELECT tag_id FROM Tag' in query:
+                return {'tag_id': 12}
+            if 'SELECT DISTINCT' in query:
+                return []
+            if 'FROM tag' in query:
+                return [tag]
+            return []
+
+        self.db.execute.side_effect = execute
+        with patch.object(tags, 'db', self.db):
+            for selected in ({'tag_id': '12'}, {}):
+                tag['is_selected'] = bool(selected)
+                response = self.client.post('/tag/workout/1/add?view=session', data=selected)
+                self.assertEqual(response.status_code, 200)
+                self.assertIn(b'workout-tag-editor-1', response.data)
+                self.assertIn(b'type=checkbox', response.data)
+                self.assertEqual(b' checked' in response.data, bool(selected))
+            tag['is_selected'] = True
+            response = self.client.post('/tag/workout/1/new?view=session', data={'tag_name': 'Push'})
+            self.assertEqual(response.status_code, 200)
+            self.assertIn(b'workout-tag-editor-1', response.data)
+            self.assertIn(b' checked', response.data)
+
 
 if __name__ == '__main__':
     unittest.main()