* Push Notification Setup and attempt

* Office Ordering * Allow editing of Task and Ticket Details after creation
2026-02-24 21:06:46 +08:00
parent cc6fda0e79
commit 5979a04254
25 changed files with 1130 additions and 91 deletions
@@ -212,22 +212,36 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
                        if (_selectedOfficeIds.isEmpty)
                          const Text('No office selected.')
                        else
-                          Wrap(
-                            spacing: 8,
-                            runSpacing: 8,
-                            children: _selectedOfficeIds.map((id) {
-                              final name = officeNameById[id] ?? id;
-                              return Chip(
-                                label: Text(name),
-                                onDeleted: _isLoading
-                                    ? null
-                                    : () {
-                                        setState(
-                                          () => _selectedOfficeIds.remove(id),
-                                        );
-                                      },
+                          Builder(
+                            builder: (context) {
+                              final sortedIds =
+                                  List<String>.from(_selectedOfficeIds)..sort(
+                                    (a, b) => (officeNameById[a] ?? a)
+                                        .toLowerCase()
+                                        .compareTo(
+                                          (officeNameById[b] ?? b)
+                                              .toLowerCase(),
+                                        ),
+                                  );
+                              return Wrap(
+                                spacing: 8,
+                                runSpacing: 8,
+                                children: sortedIds.map((id) {
+                                  final name = officeNameById[id] ?? id;
+                                  return Chip(
+                                    label: Text(name),
+                                    onDeleted: _isLoading
+                                        ? null
+                                        : () {
+                                            setState(
+                                              () =>
+                                                  _selectedOfficeIds.remove(id),
+                                            );
+                                          },
+                                  );
+                                }).toList(),
                              );
-                            }).toList(),
+                            },
                          ),
                      ],
                    );