Sikander Saleem
ae783f0d21
ppm start & end date added on work order.
2 years ago
Sikander Saleem
3dd946cd86
ppm status cannot be open
2 years ago
Sikander Saleem
9fe5112681
timer in ppm & code changed to request no.
2 years ago
Sikander Saleem
67953598ac
gas refill update & ppm attachment fix
2 years ago
Sikander Saleem
a6dd802321
receiver name added on new transfer request & improvements
2 years ago
Sikander Saleem
1a4b0be678
assistant employee on select fixed.
2 years ago
Sikander Saleem
6bb2b81ac3
improvements & fixes
2 years ago
zaid_daoud
e8415399ed
Fix
2 years ago
zaid_daoud
53b02874a0
Add validation on part no qty field
2 years ago
Sikander Saleem
8079646728
timer on device transfer,
2 years ago
Sikander Saleem
0d595449df
model no replace with model name,
...
asset next /last pm dates fixed.
pull to refresh added.
2 years ago
Sikander Saleem
4804dc1839
refresh indicator added.
2 years ago
zaid_daoud
4309c509e8
Assistant Engineer can be unselected
2 years ago
zaid_daoud
23700d0adf
Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT)
2 years ago
zaid_daoud
3e3bdf2ce6
Remove loan availability
2 years ago
zaid_daoud
7200efcbca
ppm issues fixed & code formatting
2 years ago
zaid_daoud
df9fa59f1b
prevent update ppm on complete
2 years ago
zaid_daoud
2ac79188d9
change some labels
2 years ago
zaid_daoud
cb20bf1275
edit assign employee in sub work order page
2 years ago
zaid_daoud
9e2baae2e2
Change Chart Design && Update dark theme colors
2 years ago
zaid_daoud
7418e8d937
Fix Asset Filter Pagination Issue
2 years ago
zaid_daoud
04da316440
Fix Asset Filter Pagination Issue
2 years ago
zaid_daoud
5820668599
Change open status color
2 years ago
zaid_daoud
03748d4fb4
Fixing asset picker and asset details issue
2 years ago
zaid_daoud
879e02b974
Hide the null items in PPM checklist
2 years ago
Sikander Saleem
593cecbe55
improvements
2 years ago
zaid_daoud
af17525c3c
Enhancements
2 years ago
zaid_daoud
03926a1fd1
Multiple spare parts in all places
2 years ago
zaid_daoud
51ef873770
Reformatting code
2 years ago
zaid.daoud
5bf73172f6
Previous Business Logic in Work order & sub work order
2 years ago
nextwo
81afa14ffc
When we have filters, add reset button.
2 years ago
zaid_daoud
44406e6cd0
change cards & text fields & timer & date picker bg colors when disabled
2 years ago
Sikander Saleem
09f24edb35
eSignature fixed,
2 years ago
nextwo
0a699fe33b
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
884471009a
Sub work order screen under testing
2 years ago
nextwo
fe4b071efb
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/new_views/pages/land_page/requests/asset_item_view.dart
2 years ago
nextwo
b295256d66
When log out, it keeps loading ,
...
On asset transfer, on complete & close , dont show edit button,
Signature issue on update asset.
On calendar weekly swipe data calling issue.
Also on monthly
2 years ago
Sikander Saleem
29e414a703
user profile change added & improvements.
2 years ago
nextwo
ee7665930e
dark / ligth dark & localization
2 years ago
Sikander Saleem
ecacd2ec8f
request list added on my requests.
2 years ago
Sikander Saleem
ab83963c65
improvements
2 years ago
Sikander Saleem
c96f611051
service request flow added & improvements
2 years ago
zaid_daoud
e29946e280
Search All Requests Done
2 years ago
Sikander Saleem
34bae463b6
improvements.
2 years ago
Sikander Saleem
f519841c04
improvements.
2 years ago
nextwo
4be031e8f8
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart
# lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart
# lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart
2 years ago
nextwo
4757c73737
dark / ligth dark
2 years ago
Sikander Saleem
29d83101af
statuses & date added.
2 years ago
nextwo
204305f705
dark / ligth dark
2 years ago
zaid_daoud
a024185229
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
753d9577d5
Improvements
2 years ago
Sikander Saleem
66034a6424
improvements
2 years ago
zaid_daoud
9ce5ca2f09
Improvements
2 years ago
zaid_daoud
7fcf49df5c
Improvements
2 years ago
zaid_daoud
eb8a9cc971
Improvements
2 years ago
Sikander Saleem
ff80897a3c
dashboard apis added.
2 years ago
nextwo
4ec0b27afa
loclization
2 years ago
Sikander Saleem
63cbbe48d1
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
fe624596a1
request fragment added on dashboard.
2 years ago
zaid_daoud
649ddf6c01
Fix preventive maintenance status colors
2 years ago
zaid_daoud
5e1d6517de
Change Notifications Screen Design DONE
2 years ago
Sikander Saleem
b03f350a2c
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
2c9f2dce08
notifications api added.
2 years ago
zaid_daoud
a2e2d9ac12
Timer For Working Hours
2 years ago
Sikander Saleem
258fb2c333
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/views/widgets/pentry/pentry_ppm_check_list_form.dart
2 years ago
zaid_daoud
932841cbef
PPM Done
2 years ago
zaid_daoud
8541fce08f
PPM in progress
2 years ago
zaid_daoud
2ebf36ca2f
Calibration Tool & PM Kit Design DONE
2 years ago
Sikander Saleem
fd18e5d39c
dashboard cont
2 years ago
zaid_daoud
3464666485
PPM TBS DONE
2 years ago
zaid_daoud
3299c0c7a4
Working on ppm
2 years ago
Sikander Saleem
f4afe5ca5a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
3c91abf47d
Enhancement on Signature
2 years ago
nextwo
a85d8f4880
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
2 years ago
nextwo
57abce1b75
device transfer
2 years ago
zaid_daoud
8b63cee7c5
Update Work Order Screen DONE
2 years ago
zaid_daoud
daa427bac2
Update Work Order Screen DONE
2 years ago
zaid_daoud
8b7aa8235d
Update Service Request DONE
2 years ago
Sikander Saleem
8347afec6d
Merge branch 'main_latest_merged' into main_design2.0
...
# Conflicts:
# lib/controllers/api_routes/urls.dart
# lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart
# lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
# lib/views/widgets/status/report/service_report_assistant_employee_menu.dart
2 years ago
Sikander Saleem
c9f903fac8
urgent improvements.
2 years ago
nextwo
1daf9b4437
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
62f6f135bb
device transfer
2 years ago
zaid_daoud
e407b00630
New Work Order [In Progress]
2 years ago
zaid_daoud
402f7513bd
First Action Bottom Sheet Done
2 years ago
zaid_daoud
32e54d6853
add [pm date range] & [equipment status] to asset filter
2 years ago
zaid_daoud
ee16e35485
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
fb3f442ed5
asset search done & filter assets need to be discussed
2 years ago
nextwo
985ab01bf0
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
cef6b1a77c
gas refill
2 years ago
zaid_daoud
5cf84e6988
Change device class name to asset
2 years ago
nextwo
e21bde0153
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_ar.arb
# lib/l10n/app_en.arb
# lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
nextwo
4cc12691ac
gas refill
2 years ago
zaid_daoud
957e3d9e6f
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
2 years ago
zaid_daoud
3959068858
Asset Transfer Done + Multiple Image Picker + Enhancements
2 years ago
nextwo
d6de203ba0
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 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
2 years ago
Sikander Saleem
4ffe899ff9
asset list & detail screens, models, added.
2 years ago
zaid_daoud
35b67d2cb5
_
2 years ago
zaid_daoud
0c6f4d5156
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/views/widgets/sound/sound_player.dart
2 years ago
nextwo
2604d8b253
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# pubspec.yaml
2 years ago
zaid_daoud
5b1e067a93
Pick asset screen design
2 years ago
Sikander Saleem
c49b66a401
sound player color fix.
2 years ago
zaid_daoud
7d2afa23cc
add record player to the recorder
2 years ago
zaid_daoud
e419b17bd1
Service request design done
2 years ago
Sikander Saleem
2d553b56e0
service request detail ui changed.
2 years ago
nextwo
64b249a0cd
gas refill
2 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
2 years ago
Sikander Saleem
1ee58eeed9
merge conflict resolved.
2 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
2 years ago
zaid_daoud
937c30736e
test
2 years ago
Sikander Saleem
7e17bd2558
localization i18 implementation
2 years ago
zaid_daoud
1e1ac215ea
Rename asset to be device as it was before
2 years ago
zaid_daoud
c7d6b68fd2
Change Asset & Asset Transfer models
2 years ago
Sikander Saleem
392182e234
track service request cont.
2 years ago
Sikander Saleem
150ad60de6
track service request
2 years ago
zaid_daoud
085674ee18
adding radio buttons for theme
2 years ago
Sikander Saleem
3df1bf70ca
improvements
2 years ago
zaid_daoud
ca673787f1
1 -> New Way of Localizations
...
2 -> Implementing Login Page
3 -> New way to achieve responsive design
2 years ago
Sikander Saleem
5fc2aceecf
ppm disable edit on closed, gaz refill site fix, & print statements remove.
2 years ago
zaid_daoud
9dca070121
add asset id to spare parts API
...
add attachments and signature to the sender & receiver info
2 years ago
zaid_daoud
50c551705f
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
2 years ago
nextwo
91be46db22
confirm the call last situation has a part in some cases
...
add time in date picker, when first action is need a visit
disable update, edit workorder & create work order if status is a complete or closed
2 years ago
zaid_daoud
1c9101d8ab
Fix pm entry empty values when scroll
2 years ago
zaid_daoud
a26684de11
Device Status in PM Entry
2 years ago
Sikander Saleem
6e0ff34499
improvements
2 years ago
zaid_daoud
58c5b434e2
Fault Desc Issue Fixed
2 years ago
zaid_daoud
2384bab11f
Fault Desc Issue Fixed
2 years ago
Sikander Saleem
d63a18226a
ppm attachments fix
2 years ago
zaid_daoud
0950639c22
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
2 years ago
zaid_daoud
fe9ca387ed
Multiple Images Everywhere
2 years ago
Sikander Saleem
830bf6e5e6
first action improvement.
2 years ago
Sikander Saleem
da339c68f4
Merge branch 'zaid_development_new' into sikander-development
2 years ago
Sikander Saleem
c9705e0b74
attachments improvements.
2 years ago
zaid_daoud
6d6fc30806
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
2 years ago
Sikander Saleem
8624515433
local & network files opener added.
2 years ago
zaid_daoud
19cd20c645
1- Fix Vendor Engineer Issue
...
2- Add Install Qty & Return Qty
2 years ago
Sikander Saleem
90aabebe12
calling api to get complete data for service request to show attachments and voice notes. & improvements
2 years ago
zaid_daoud
ad48521170
Merge remote-tracking branch 'origin/sikander-development' into zaid_development_new
2 years ago
zaid_daoud
0b46974c47
Change Pick Image to Pick File
2 years ago
Sikander Saleem
f3349b0209
improvements.
2 years ago
zaid_daoud
05d1976969
Make QR code searches for a specific elements which are equal to asset no.
2 years ago
zaid_daoud
5f842068a4
Track Asset Transfer [Most Recent]
2 years ago
zaid_daoud
fd439a4f46
Track Asset Transfer [Most Recent]
2 years ago
zaid_daoud
d277a28f54
Activate Attachment Picker Dialog with a New Field (Pick From Files)
2 years ago
Sikander Saleem
1eaf9a21fa
asset transfer status fixed.
2 years ago
zaid_daoud
6c2480edd2
stop loading on null values
2 years ago
Sikander Saleem
cb093e0be1
Merge branch 'zaid_development_new' into sikander-development
2 years ago
zaid_daoud
bfacfc68e2
fix
2 years ago
Sikander Saleem
91d6b686c7
Merge branch 'zaid_development_new' into sikander-development
2 years ago
zaid_daoud
bc3696cd1e
loading when fault description is null or empty
2 years ago
zaid_daoud
8962889973
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
2 years ago
zaid_daoud
2761edf17d
Support jpeg
2 years ago
Sikander Saleem
8736e68c27
Merge branch 'zaid_development_new' into sikander-development
2 years ago
Sikander Saleem
7ca12e6484
record audio plugin replaced.
2 years ago
zaid_daoud
90fe4e76b7
Asset Transfer Search Dialog Done
2 years ago
nextwo
798faf51a4
Merge branch 'zaid_development_new' into majd_development_new
2 years ago
nextwo
b3c577d03e
fix bugs
2 years ago
zaid_daoud
5aedb12004
Vendor Fields Have Been Added
2 years ago
zaid_daoud
a3264f4f1c
Multiple types of attachments
2 years ago
zaid_daoud
799c9a50bd
nothing
2 years ago
zaid_daoud
7a02b2e715
fault description is disabled when create new work order
2 years ago
zaid_daoud
29c5f0e5cf
in ppm summery if no employee found it will be empty
2 years ago
zaid_daoud
614426853b
[API doesn't support the required parameters] add search dialog to track asset transfer
2 years ago
zaid_daoud
d80e28f706
gaz refill timer
2 years ago
Sikander Saleem
5bab5c92a6
improvement.
2 years ago
zaid_daoud
99c16197f2
Service Request Type for end user profile should be by default Maintenance Request and locked field.
2 years ago
zaid_daoud
66100c36a4
Enhancements
2 years ago
zaid_daoud
6caab58171
Merge With Majd [part #2 ]
2 years ago
zaid_daoud
984f46913a
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
...
# Conflicts:
# lib/models/visits/visits_search.dart
# lib/views/pages/device_transfer/device_transfer_details.dart
# lib/views/pages/user/gas_refill/request_gas_refill.dart
# lib/views/widgets/device_trancfer/device_transfer_info_section.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
2 years ago
nextwo
be636bb18b
some changes
2 years ago
zaid_daoud
60a2e372a3
Change To Powered By Cloud Solutions, and remove engineer name from the track device transfer info, in addition to merge with majd's branch
2 years ago
zaid_daoud
460c3138fd
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
...
# Conflicts:
# lib/models/visits/visits_search.dart
# lib/views/pages/device_transfer/device_transfer_details.dart
# lib/views/pages/user/visits/visit_details.dart
# lib/views/widgets/search/service_request_search_bar.dart
# lib/views/widgets/search/visits_search_bar.dart
2 years ago
nextwo
c393f29829
some changes
3 years ago
zaid_daoud
46f61884bc
In track gas refill summery to add Gas Type and Expected Date fields.
3 years ago
zaid_daoud
4d3c128191
Remove Search Work Order Module and add the following filters in search service request:
...
○ Assigned Employee
○ Call ID
○ Call Date (Service Request Date)
3 years ago
zaid_daoud
96c9515e87
Status for both sender and receiver is synchronized.
3 years ago
zaid_daoud
11f95b9578
Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt
3 years ago
zaid_daoud
4d548e1048
In Asset Transfer request add Destination label under pick asset
3 years ago
zaid_daoud
64d9305b84
Site Field locked and the data retrieved from user info
3 years ago
zaid_daoud
bb5cc8eda6
The speech to text in new service request is stop recording now
...
Microphone permission issue on IOS has been fixed also the delete option is working in IOS version now
3 years ago
zaid_daoud
21f7986fa4
1- Service Request Type for end user profile should be by default Maintenance Request and locked field.
...
2- Through field in new service request should be by default APP and locked or hidden.
3- Rename text to speech to speech to text.
3 years ago
zaid_daoud
914a9e0057
Add Asset Number and Asset Name in new service request after select pickup Asset
3 years ago
zaid_daoud
4997e1e3df
Timer Fixed
3 years ago
Sikander Saleem
8bc2275c35
asset name added in device transfer list.
3 years ago
Sikander Saleem
b8051a40fe
signature fixes
3 years ago
Sikander Saleem
883f32d9e6
Merge branch 'majd_development_new' into main_latest_merged
3 years ago
zaid_daoud
2a85d6b355
Simple Changes
3 years ago
zaid_daoud
5890835f7b
Simple Changes
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
0459ab14e2
PPM Updates Done
3 years ago
zaid_daoud
53c1f83bac
Enhancements
3 years ago
zaid_daoud
8e8cdb6bfe
Dropdown issue
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
9cf9c7f30c
- New Gas Refill -> Status Disabled With ("Open") default value.
...
- Rename (Pentry) to (PM Entry)
3 years ago
zaid_daoud
b97d6e4283
- on deivce transfer list screen, add asset number.
...
- on deivce transfer details screen, add asset name on 2nd position.
- on deivce transfer details screen, add asset serial number.
- on deivce transfer details screen, rename title to transfer id.
- on deivce transfer details screen, name unit to department.
3 years ago
zaid_daoud
45b66e6b2a
Convert (Start Date & End Date) to Timer
3 years ago