 Sikander Saleem
|
dfef9aadb7
|
Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module
|
1 year ago |
|
Sikander Saleem
|
a9973047d6
|
improvement
|
1 year ago |
 WaseemAbbasi22
|
e5775019a4
|
asset inventory design
|
1 year ago |
|
Sikander Saleem
|
4d035e9c46
|
android AGP upgraded & enhancement.
|
1 year ago |
|
Sikander Saleem
|
f3539f1471
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
|
1 year ago |
|
Sikander Saleem
|
c1b1f37eec
|
asset search loading ui fixed.
|
1 year ago |
Sikander Saleem
|
47673e3473
|
Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
# Conflicts:
# lib/modules/cm_module/views/components/action_button/footer_action_button.dart
# lib/modules/cm_module/views/components/service_request_detail_view.dart
# lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
# lib/modules/tm_module/tasks_wo/update_task_request_view.dart
# lib/views/pages/user/gas_refill/update_gas_refill_request.dart
# lib/views/widgets/images/multi_image_picker.dart
|
1 year ago |
|
WaseemAbbasi22
|
6d39b20e0b
|
dark mode implementation
|
1 year ago |
|
Sikander Saleem
|
6539848f31
|
method name fix.
|
1 year ago |
|
WaseemAbbasi22
|
72823e37f8
|
bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
|
2 years ago |
|
Sikander Saleem
|
3ee2b66fbf
|
code clean, unused files removed.
|
2 years ago |
|
Sikander Saleem
|
33dea07449
|
merge conflict resolved and file format.
|
2 years ago |
|
Sikander Saleem
|
e0902eddf7
|
Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/extensions/widget_extensions.dart
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
# lib/new_views/pages/new_gas_refill_request_page.dart
# lib/views/pages/user/gas_refill/request_gas_refill.dart
# lib/views/widgets/equipment/asset_picker.dart
|
2 years ago |
|
Sikander Saleem
|
b75c0b321d
|
multiple asset picker added.
|
2 years ago |
|
Sikander Saleem
|
f043c6ff6c
|
point 8 fixed,
|
2 years ago |
|
WaseemAbbasi22
|
54db7c97fc
|
Task Request nurse side ui completed
|
2 years ago |
|
WaseemAbbasi22
|
289d06ff68
|
Asset transfer nurse side ui completed
|
2 years ago |
|
Sikander Saleem
|
81d4fa6a89
|
ppm calibration tools, pm kits and checklist ui changed
|
2 years ago |
|
Sikander Saleem
|
58f5f6103a
|
app red screen, on drawer & asset filter fixed.
|
2 years ago |
|
muhammad.abbasi
|
e8dc052d02
|
integrating api in new flow
|
2 years ago |
|
Sikander Saleem
|
69ae0147bb
|
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
# Conflicts:
# lib/dashboard_latest/dashboard_provider.dart
# lib/dashboard_latest/dashboard_view.dart
# lib/dashboard_latest/widgets/progress_fragment.dart
# lib/dashboard_latest/widgets/requests_fragment.dart
# lib/new_views/app_style/app_color.dart
# lib/service_request_latest/request_detail_provider.dart
# lib/service_request_latest/views/components/request_detail_view.dart
# lib/service_request_latest/views/request_detail_main_view.dart
|
2 years ago |
|
Sikander Saleem
|
0d333fa688
|
dashboard screen & service detail screen, flow changed.
|
2 years ago |
|
muhammad.abbasi
|
68a8dc250f
|
bug fixes
|
2 years ago |
|
Sikander Saleem
|
e6e35ab1d0
|
null safety conversion complete.
|
2 years ago |
|
Sikander Saleem
|
be4c8d7653
|
null safety conversation complete
|
2 years ago |
|
Sikander Saleem
|
fe8ac14e46
|
sdk upgrade changes-1.
|
2 years ago |
|
Sikander Saleem
|
7d0a2eb65c
|
sdk upgrade changes.
|
2 years ago |
nextwo
|
e65d2a44ed
|
search asset ui
|
2 years ago |
|
nextwo
|
9a1303fc5e
|
search asset ui
|
2 years ago |
|
nextwo
|
a9fb22583e
|
Merge remote-tracking branch 'origin/main_design2.1' into main_design2.1
|
2 years ago |
|
Sikander Saleem
|
3c182b856d
|
new service request flow & ui. & voice record timer fix.
|
2 years ago |
|
nextwo
|
3cc7176c63
|
scan asset ui
|
2 years ago |
|
nextwo
|
7ef71849dd
|
comment unused files
|
2 years ago |
|
Sikander Saleem
|
d2e4c8276c
|
snag points added.
|
3 years ago |
|
Sikander Saleem
|
60639620c6
|
snag issues resolve
|
3 years ago |
|
Sikander Saleem
|
e2750094d9
|
asset loading fix.
|
3 years ago |
|
Sikander Saleem
|
7d41050713
|
improvements
|
3 years ago |
|
Sikander Saleem
|
6bb2b81ac3
|
improvements & fixes
|
3 years ago |
|
Sikander Saleem
|
0d595449df
|
model no replace with model name,
asset next /last pm dates fixed.
pull to refresh added.
|
3 years ago |
 zaid_daoud
|
23700d0adf
|
Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT)
|
3 years ago |
|
zaid_daoud
|
2ac79188d9
|
change some labels
|
3 years ago |
|
zaid_daoud
|
9e2baae2e2
|
Change Chart Design && Update dark theme colors
|
3 years ago |
|
zaid_daoud
|
7418e8d937
|
Fix Asset Filter Pagination Issue
|
3 years ago |
|
zaid_daoud
|
04da316440
|
Fix Asset Filter Pagination Issue
|
3 years ago |
|
zaid_daoud
|
03748d4fb4
|
Fixing asset picker and asset details issue
|
3 years ago |
|
Sikander Saleem
|
593cecbe55
|
improvements
|
3 years ago |
|
zaid_daoud
|
51ef873770
|
Reformatting code
|
3 years ago |
|
nextwo
|
81afa14ffc
|
When we have filters, add reset button.
|
3 years ago |
|
Sikander Saleem
|
29e414a703
|
user profile change added & improvements.
|
3 years ago |
|
Sikander Saleem
|
ecacd2ec8f
|
request list added on my requests.
|
3 years ago |
|
Sikander Saleem
|
ab83963c65
|
improvements
|
3 years ago |
|
zaid_daoud
|
e29946e280
|
Search All Requests Done
|
3 years ago |
|
Sikander Saleem
|
34bae463b6
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
f519841c04
|
improvements.
|
3 years ago |
|
nextwo
|
4757c73737
|
dark / ligth dark
|
3 years ago |
|
nextwo
|
204305f705
|
dark / ligth dark
|
3 years ago |
|
Sikander Saleem
|
66034a6424
|
improvements
|
3 years ago |
|
Sikander Saleem
|
ff80897a3c
|
dashboard apis added.
|
3 years ago |
|
nextwo
|
4ec0b27afa
|
loclization
|
3 years ago |
|
Sikander Saleem
|
fd18e5d39c
|
dashboard cont
|
3 years ago |
|
zaid_daoud
|
8b7aa8235d
|
Update Service Request DONE
|
3 years ago |
|
zaid_daoud
|
32e54d6853
|
add [pm date range] & [equipment status] to asset filter
|
3 years ago |
|
zaid_daoud
|
fb3f442ed5
|
asset search done & filter assets need to be discussed
|
3 years ago |
|
zaid_daoud
|
5cf84e6988
|
Change device class name to asset
|
3 years ago |
|
Sikander Saleem
|
487b04514a
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
|
3 years ago |
|
Sikander Saleem
|
4ffe899ff9
|
asset list & detail screens, models, added.
|
3 years ago |
|
zaid_daoud
|
5b1e067a93
|
Pick asset screen design
|
3 years ago |
|
zaid_daoud
|
e419b17bd1
|
Service request design done
|
3 years ago |
|
Sikander Saleem
|
eaa9bb62ee
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# assets/translations/ar.json
# lib/views/widgets/equipment/pick_asset.dart
|
3 years ago |
|
Sikander Saleem
|
1ee58eeed9
|
merge conflict resolved.
|
3 years ago |
|
Sikander Saleem
|
47b863c479
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/main.dart
# lib/new_views/common_widgets/app_floating_action_button.dart
# lib/new_views/common_widgets/app_text_form_field.dart
# lib/new_views/pages/new_gas_refill_request_page.dart
# lib/new_views/pages/new_service_request_page.dart
# lib/views/pages/device_transfer/device_transfer_details.dart
# lib/views/pages/device_transfer/update_device_transfer.dart
# lib/views/pages/user/requests/create_request.dart
# lib/views/pages/user/requests/request_details.dart
# lib/views/widgets/device_trancfer/device_transfer_info_section.dart
# lib/views/widgets/device_trancfer/device_transfer_item.dart
# lib/views/widgets/device_trancfer/device_transfer_list.dart
# lib/views/widgets/equipment/auto_complete_devices_field.dart
# lib/views/widgets/equipment/auto_complete_models_field.dart
# lib/views/widgets/equipment/device_button.dart
# lib/views/widgets/equipment/device_item.dart
# lib/views/widgets/equipment/single_device_picker.dart
# lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
# lib/views/widgets/requests/service_request_item.dart
# lib/views/widgets/search/asset_transfer_search_dialog.dart
|
3 years ago |
|
zaid_daoud
|
937c30736e
|
test
|
3 years ago |
|
Sikander Saleem
|
7e17bd2558
|
localization i18 implementation
|
3 years ago |
|
zaid_daoud
|
1e1ac215ea
|
Rename asset to be device as it was before
|
3 years ago |
|
zaid_daoud
|
c7d6b68fd2
|
Change Asset & Asset Transfer models
|
3 years ago |
|
Sikander Saleem
|
5fc2aceecf
|
ppm disable edit on closed, gaz refill site fix, & print statements remove.
|
3 years ago |
|
zaid_daoud
|
05d1976969
|
Make QR code searches for a specific elements which are equal to asset no.
|
3 years ago |
|
zaid_daoud
|
6caab58171
|
Merge With Majd [part #2]
|
3 years ago |
|
nextwo
|
be636bb18b
|
some changes
|
3 years ago |
|
zaid_daoud
|
4d548e1048
|
In Asset Transfer request add Destination label under pick asset
|
3 years ago |
|
zaid_daoud
|
914a9e0057
|
Add Asset Number and Asset Name in new service request after select pickup Asset
|
3 years ago |
|
nextwo
|
f583151345
|
show images in the app + search list issue
|
3 years ago |
|
nextwo
|
44654e1e38
|
some edits
|
3 years ago |
|
nextwo
|
3737c3b41c
|
Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new
# Conflicts:
# lib/views/pages/user/requests/report/edit_service_report.dart
# lib/views/widgets/equipment/single_device_picker.dart
|
3 years ago |
|
nextwo
|
c58a86758c
|
some edits
|
3 years ago |
|
zaid_daoud
|
53c1f83bac
|
Enhancements
|
3 years ago |
|
zaid_daoud
|
c742dfaacc
|
Asset name rather than asset serial number
|
3 years ago |
|
zaid_daoud
|
ccf329798a
|
QR reader
|
3 years ago |
|
zaid_daoud
|
674a803189
|
Fixing Bug
|
3 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
|
3 years ago |
|
nextwo
|
756e2a1881
|
implement searchWorkOrders api and edit on ui
|
3 years ago |
|
zaid_daoud
|
31c7c7376f
|
Enhancements
|
3 years ago |
|
zaid daoud
|
51c5bcc3a0
|
Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
|
3 years ago |
|
zaid_daoud
|
d0f083ce22
|
- Update Login API
- Adding Get Service Request By ID API
|
3 years ago |
|
nextwo
|
12764a647c
|
pagintion + FIX BUGS
|
3 years ago |
|
Sikander Saleem
|
534aab3ceb
|
latest code merge changes
|
4 years ago |
|
Sikander Saleem
|
c5c96a4fce
|
Merge remote-tracking branch 'atoms_main/main' into main_latest_merged
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/departments_provider.dart
# lib/controllers/providers/api/device_transfer_provider.dart
# lib/controllers/providers/api/devices_provider.dart
# lib/controllers/providers/api/gas_refill_provider.dart
# lib/controllers/providers/api/hospitals_provider.dart
# lib/controllers/providers/api/parts_provider.dart
# lib/controllers/providers/api/regular_visits_provider.dart
# lib/controllers/providers/api/service_requests_provider.dart
# lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart
# lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart
# lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart
# lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart
# lib/main.dart
# lib/models/device/device.dart
# lib/models/device/device_transfer.dart
# lib/models/device/device_transfer_info.dart
# lib/models/gas_refill/gas_refill_details.dart
# lib/models/gas_refill/gas_refill_model.dart
# lib/models/lookup.dart
# lib/models/pantry/calibration_tools.dart
# lib/models/pantry/lookups/contact_person.dart
# lib/models/pantry/lookups/contact_title.dart
# lib/models/pantry/pentry.dart
# lib/models/pantry/pm_kit.dart
# lib/models/pantry/ppm_check_list.dart
# lib/models/service_report.dart
# lib/models/service_request/service_request.dart
# lib/models/user.dart
# lib/models/visits/visit.dart
# lib/models/visits/visits_group.dart
# lib/views/app_style/colors.dart
# lib/views/pages/login.dart
# lib/views/pages/register.dart
# lib/views/pages/splash_screen.dart
# lib/views/pages/user/land_page.dart
# lib/views/pages/user/requests/create_request.dart
# lib/views/pages/user/requests/report/create_service_report.dart
# lib/views/pages/user/requests/report/edit_service_report.dart
# lib/views/pages/user/requests/request_details.dart
# lib/views/pages/user/visits/pantry/edit_pentry.dart
# lib/views/pages/user/visits/preventive_maintenance_visits_page.dart
# lib/views/pages/user/visits/regular_visits_page.dart
# lib/views/pages/user/visits/update_visits_group_sheet.dart
# lib/views/pages/user/visits/visit_details.dart
# lib/views/widgets/app_text_form_field.dart
# lib/views/widgets/buttons/app_back_button.dart
# lib/views/widgets/departments/department_button.dart
# lib/views/widgets/drawer/drawer_item.dart
# lib/views/widgets/equipment/auto_complete_devices_field.dart
# lib/views/widgets/equipment/device_button.dart
# lib/views/widgets/equipment/single_device_picker.dart
# lib/views/widgets/hospitals/hospital_auto_complete_field.dart
# lib/views/widgets/hospitals/hospital_button.dart
# lib/views/widgets/images/multi_image_picker.dart
# lib/views/widgets/loaders/loading_manager.dart
# lib/views/widgets/parts/auto_complete_parts_field.dart
# lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
# lib/views/widgets/pentry/pentry_calibration_tool_form.dart
# lib/views/widgets/pentry/pentry_info_form.dart
# lib/views/widgets/pentry/pentry_pm_kit_form.dart
# lib/views/widgets/requests/service_request_update_dialog.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
# lib/views/widgets/sound/record_sound.dart
# lib/views/widgets/sound/sound_player.dart
# lib/views/widgets/speech_to_text/speech_to_text.dart
# lib/views/widgets/status/employee/assigned_to_mune.dart
# lib/views/widgets/status/multi_status_menu.dart
# lib/views/widgets/status/report/service_status.dart
# lib/views/widgets/status/single_status_menu.dart
# lib/views/widgets/timer/app_timer.dart
# lib/views/widgets/visits/visit_item.dart
# pubspec.yaml
|
4 years ago |
MaximusAshraf
|
910e01324f
|
bug fixing
|
4 years ago |
|
MaximusAshraf
|
75fedf395e
|
new server edits
|
4 years ago |
|
Sikander Saleem
|
4af0c3c9b0
|
import optimization
|
4 years ago |