Commit Graph

1282 Commits (design_3.0_GlobalHealth)
 

Author SHA1 Message Date
Sikander Saleem c24353c9ea work order fixes. 2 years ago
Sikander Saleem e20e99bebe through fix. 2 years ago
Sikander Saleem f9e9f63348 Merge branch 'zaid_development_new' into 'main_latest_merged'
Zaid development new

See merge request haroon6138/cloudsolutions-atoms!30
2 years ago
Sikander Saleem ecb8d1e1a7 improvements 2 years ago
Sikander Saleem 29181aa965 Merge branch 'main_latest_merged' into zaid_development_new
# Conflicts:
#	assets/subtitles/en_subtitle.json
#	lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
#	lib/models/subtitle.dart
#	lib/views/pages/user/requests/report/create_service_report.dart
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/widgets/status/report/service_report_status.dart
2 years ago
Sikander Saleem 49147eab3d improvement. 2 years ago
zaid_daoud 9346990626 Enhancemnets 2 years ago
zaid_daoud 64cb524917 Change service last calls API 2 years ago
Sikander Saleem 37df63c866 user role parsing fix. 2 years ago
zaid_daoud 5f7bc0cf6e Change service last calls API 2 years ago
Sikander Saleem a69e048388 Merge branch 'majd_development_new' into 'main_latest_merged'
Majd development new

See merge request haroon6138/cloudsolutions-atoms!29
2 years ago
nextwo 4e89566d1f implement searchWorkOrders api and edit on ui 2 years ago
nextwo 8b7b40b0af Merge branch 'main_latest_merged' into majd_development_new
# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/main.dart
#	lib/models/service_request/service_request.dart
#	lib/views/pages/splash_screen.dart
#	lib/views/pages/user/notifications/notifications_page.dart
#	lib/views/pages/user/profile_page.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/pages/user/requests/requests_page.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
zaid_daoud 5945756e60 New Work Order Done (Unable to upload Engineer Signature) 2 years ago
nextwo 2a5a8f411f implement searchWorkOrders api and edit on ui 2 years ago
nextwo 756e2a1881 implement searchWorkOrders api and edit on ui 2 years ago
Sikander Saleem cb8d13a939 Merge branch 'zaid_development_new' into 'main_latest_merged'
version 0.7.4 - update pentry

See merge request haroon6138/cloudsolutions-atoms!27
2 years ago
Sikander Saleem f39b6f5d8e work order improvement. 2 years ago
nextwo d869f82020 implement searchWorkOrders api and edit on ui 2 years ago
zaid_daoud 31c7c7376f Enhancements 2 years ago
zaid_daoud 62dcae610d Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
zaid_daoud 7044cc8ff0 Enhancements 2 years ago
zaid daoud 51c5bcc3a0 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/widgets/equipment/single_device_picker.dart
2 years ago
zaid_daoud d0f083ce22 - Update Login API
- Adding Get Service Request By ID API
2 years ago
zaid_daoud a219d81ccc Update Service Request Done 2 years ago
zaid_daoud a499889603 Add New Service Body Changed 2 years ago
zaid_daoud bdfa26411b Add New Service Body Changed 2 years ago
zaid_daoud 93f2378ec5 Update Service Request Date Still Has Issue 2 years ago
Sikander Saleem 191eefdc56 Merge branch 'majd_development_new' into 'main_latest_merged'
fix track device transfer issue

See merge request haroon6138/cloudsolutions-atoms!26
2 years ago
nextwo d88cadad33 Merge branch 'main_latest_merged' into majd_development_new 2 years ago
nextwo dad222f8fb fix track device transfer issue 2 years ago
zaid_daoud e08fcc8b32 Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 2 years ago
zaid_daoud 81a6a515c4 Enhancements 2 years ago
Sikander Saleem 7561dd2332 Merge branch 'majd_development_new' into 'main_latest_merged'
version 0.7.4 - update pentry

See merge request haroon6138/cloudsolutions-atoms!25
2 years ago
nextwo 1201a4d542 Merge branch 'main_latest_merged' into majd_development_new 2 years ago
Sikander Saleem a9c54c9d7a Merge branch 'zaid_development_new' into 'main_latest_merged'
Zaid development new

See merge request haroon6138/cloudsolutions-atoms!24
2 years ago
nextwo 12764a647c pagintion + FIX BUGS 2 years ago
zaid daoud 6fd1f53315 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/pages/user/land_page.dart
3 years ago
zaid_daoud 42787e450e Enhancements 3 years ago
zaid_daoud 048774bd8c Enhancements 3 years ago
zaid_daoud 8968f9ae2f Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new 3 years ago
zaid_daoud e25dc22bd0 Enhancements 3 years ago
zaid_daoud a33e4f4b7d Preventive Maintenance Search Issue Fixed 3 years ago
zaid_daoud f7057f4827 Login Api Issue Fixed Manually 3 years ago
Sikander Saleem 5265a45563 Merge branch 'majd_development_new' into 'main_latest_merged'
Majd development new

See merge request haroon6138/cloudsolutions-atoms!23
3 years ago
majd alattari ca5e0fa9b4 Merge branch 'main_latest_merged' into 'majd_development_new'
# Conflicts:
#   lib/controllers/providers/api/device_transfer_provider.dart
#   lib/views/pages/user/land_page.dart
#   lib/views/widgets/status/single_status_menu.dart
3 years ago
Sikander Saleem 0736abba17 Merge branch 'zaid_development_new' into 'main_latest_merged'
Fixing bugs

See merge request haroon6138/cloudsolutions-atoms!22
3 years ago
majd alattari e2a3ae4cb7 Merge branch 'main_latest_merged' into 'majd_development_new'
# Conflicts:
#   lib/views/widgets/status/single_status_menu.dart
3 years ago
nextwo 2c09cdb7e4 FIX BUGS 3 years ago
zaid daoud 3623cf9786 Merge branch 'main_latest_merged' into 'zaid_development_new' 3 years ago