muhammad.abbasi
1f30aec2ff
verify arrival fixes
1 year ago
muhammad.abbasi
1655bab9ad
verify arrival fixes
1 year ago
muhammad.abbasi
b852b29a09
fix remotely working hours auto assign fixes
1 year ago
muhammad.abbasi
5d204687cc
fix remotely working hours auto assign fixes
1 year ago
muhammad.abbasi
044eadaacc
ready for initial testing
1 year ago
muhammad.abbasi
0dd4a0f254
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi
f1fe0b3339
edit maintenance request completed
1 year ago
Sikander Saleem
298a102f67
reorder activities added.
1 year ago
muhammad.abbasi
71d4ba43de
add maintenance request completed
1 year ago
muhammad.abbasi
88b92d2d44
add maintenance request completed
1 year ago
muhammad.abbasi
c2f4722bb3
add maintenance request completed
1 year ago
muhammad.abbasi
0b72f0b219
add maintenance request completed
1 year ago
muhammad.abbasi
77d18bd413
add maintenance request completed
1 year ago
Sikander Saleem
9628a6408e
single dropdown loading fix.
1 year ago
Sikander Saleem
690b3822f5
code and logic improvements.
1 year ago
Sikander Saleem
40a96bad7c
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/extensions/widget_extensions.dart
1 year ago
Sikander Saleem
c0afad329b
improvement.
1 year ago
muhammad.abbasi
457455a1b5
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/new_views/common_widgets/single_item_drop_down_menu.dart
1 year ago
muhammad.abbasi
0095facdf5
maintenance request flow in progress
1 year ago
Sikander Saleem
e1aaa71ae7
spare part comment fix and improvement.
1 year ago
Sikander Saleem
701455d939
ui and spare part improvement.
1 year ago
Sikander Saleem
3484859028
dashboard & workorder details bug fixes.
1 year ago
muhammad.abbasi
b04cd1e042
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/new_views/pages/land_page/land_page.dart
1 year ago
muhammad.abbasi
34e54df40d
intial testing fixes
1 year ago
Sikander Saleem
c556f0dd87
requests improvements-1
1 year ago
Sikander Saleem
a55ef11780
requests improvements
1 year ago
muhammad.abbasi
ec34de11c5
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
1 year ago
muhammad.abbasi
473b26036e
initial testing
1 year ago
Sikander Saleem
b76a0bc53a
new file picker added.
1 year ago
Sikander Saleem
2ec3b18231
dashboard status fragment only for engineer
1 year ago
muhammad.abbasi
cc9b993de7
Merge remote-tracking branch 'origin/design_3.0_sdk_upgrade' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/models/new_models/work_order_detail_model.dart
1 year ago
muhammad.abbasi
c2b3288423
in progress
1 year ago
Sikander Saleem
0fa9173f01
history log improvement.
1 year ago
Sikander Saleem
0ea7954c6a
history log completed.
1 year ago
muhammad.abbasi
58666916cc
integrating api in new flow
1 year ago
muhammad.abbasi
e8dc052d02
integrating api in new flow
1 year ago
muhammad.abbasi
acbf33e2a2
Merge branch 'refs/heads/design_3.0_sdk_upgrade' into design_3.0_waseem_dev
...
# Conflicts:
# lib/service_request_latest/views/components/request_detail_view.dart
1 year ago
muhammad.abbasi
8dd596bc35
-design completed
1 year ago
Sikander Saleem
c6d8c299f7
merge conflict resolve.
1 year 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
1 year ago
Sikander Saleem
0d333fa688
dashboard screen & service detail screen, flow changed.
1 year ago
muhammad.abbasi
53c5240377
ui fixes
1 year ago
muhammad.abbasi
68a8dc250f
bug fixes
1 year ago
Sikander Saleem
0131297029
login screen improvement
1 year ago
muhammad.abbasi
d99a083792
bug fixes
1 year ago
muhammad.abbasi
bbcf093af3
update files to null seafty
1 year ago
muhammad.abbasi
1ce6f0f72c
null seafty bug fixes
1 year ago
muhammad.abbasi
a9ef3a827c
null seafty bug fixes
1 year ago
Sikander Saleem
f694252828
null safety conversion after merge.
1 year ago
Sikander Saleem
0d876a41fc
Merge remote-tracking branch 'refs/remotes/origin/design_3.0_waseem' into design_3.0_sdk_upgrade
...
# Conflicts:
# lib/controllers/providers/api/service_requests_provider.dart
# lib/dashboard_latest/dashboard_view.dart
# lib/dashboard_latest/widgets/progress_fragment.dart
# lib/extensions/text_extensions.dart
# lib/models/lookup.dart
# lib/new_views/app_style/app_themes.dart
# lib/new_views/common_widgets/app_bottom_nav_bar.dart
# lib/new_views/common_widgets/app_dashed_button.dart
# lib/new_views/common_widgets/app_filled_button.dart
# lib/new_views/pages/land_page/land_page.dart
# lib/new_views/pages/land_page/requests_list_page.dart
# lib/providers/work_order/reason_provider.dart
# lib/service_request_latest/views/components/bottom_sheets/action_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/activity_type_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/initial_visit_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/reject_request_bottomsheet.dart
# lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
# lib/service_request_latest/views/components/request_detail_view.dart
# lib/service_request_latest/views/components/verify_arrival_view.dart
# lib/service_request_latest/views/forms/spare_part/spare_part_request.dart
# lib/utilities/general_utils.dart
# lib/views/widgets/date_and_time/date_picker.dart
# lib/views/widgets/date_and_time/time_picker.dart
# lib/views/widgets/e_signature/e_signature.dart
# lib/views/widgets/images/multi_image_picker.dart
# pubspec.yaml
1 year ago
muhammad.abbasi
d13f3e3551
Ui updated
1 year ago
Sikander Saleem
e6e35ab1d0
null safety conversion complete.
1 year ago
Sikander Saleem
be4c8d7653
null safety conversation complete
1 year ago
Sikander Saleem
fe8ac14e46
sdk upgrade changes-1.
1 year ago
muhammad.abbasi
f257fbadfa
new Api models and provider added
1 year ago
Sikander Saleem
7d0a2eb65c
sdk upgrade changes.
1 year ago
muhammad.abbasi
667e12a548
service detail new flow ui
1 year ago
muhammad.abbasi
d5ee12abbb
flow changed ui improvement according to new design
1 year ago
Muhammad Abbasi
246bb1fb55
pagination added
1 year ago
Muhammad Abbasi
ad1a01b7c6
initial commit
1 year ago
Sikander Saleem
2c6e81284d
1.2.2+9 uploaded.
1 year ago
Sikander Saleem
9631750eab
improvement.
2 years ago
Sikander Saleem
ed256dac7c
improvements.
2 years ago
nextwo
c1c0bcd646
fix show assets
2 years ago
nextwo
2378d1635e
re-scan
2 years ago
Sikander Saleem
a1941511a0
call comments are mandatory now.
2 years ago
Sikander Saleem
da442df2bb
pending asset requests new parameter added.
2 years ago
Sikander Saleem
865a2197ad
Merge remote-tracking branch 'origin/main_design2.1' into main_design2.1
2 years ago
Sikander Saleem
a9042a834c
text to speech, call comments & voice record added.
2 years ago
nextwo
49a6ac8996
add oracle code parameter
2 years ago
nextwo
bc1b3afe84
search asset ui
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
Sikander Saleem
ad3549b9a4
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
b2bf3c8014
enable face detection.
2 years ago
nextwo
7ef71849dd
comment unused files
2 years ago
Sikander Saleem
5348bc81eb
sub work order improvements.
2 years ago
nextwo
0302c658e6
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
1f18dcadb7
majd
2 years ago
Sikander Saleem
be449b8a51
android target sdk moved to 34.
2 years ago
Sikander Saleem
f681e784b2
ios face id config added.
2 years ago
nextwo
b792585810
add timer list in asset transfer for sender and receiver
2 years ago
nextwo
67854d2e8c
add timer list in asset transfer for sender and receiver
2 years ago
Sikander Saleem
45372d7cdd
multi auth improvement.
2 years ago
Sikander Saleem
8273537b00
create supplier engineer functionality added.
2 years ago
Sikander Saleem
b508e839c5
multi auth added, token verification added, multi time added on ppm.
2 years ago
Sikander Saleem
e212cf75b1
ppm multi timer added.
2 years ago
Sikander Saleem
e304a252d6
1.2.0 uploaded.
2 years ago
Sikander Saleem
494087ef18
update service request & work order attachment issue fix.
2 years ago
Sikander Saleem
06cee34657
first action fixed remotely, start & end date added.
2 years ago
Sikander Saleem
a7f2573584
remember me added.
2 years ago
Sikander Saleem
ff3dfcc9cb
Merge branch 'main_production' into main_design2.0
2 years ago
Sikander Saleem
6281364579
dashboard api calling structure improvement.
2 years ago
Sikander Saleem
11ab040f90
biometric / faceId auth added. cont.
2 years ago
Sikander Saleem
f3b432d0c1
ppm external supplier fields added. & improvements.
2 years ago
Sikander Saleem
76137c2ace
ppm technical comment added.
2 years ago
Sikander Saleem
40fe6ec192
archived data filter added.
2 years ago
Sikander Saleem
d50f711aec
archived cont.
2 years ago
Sikander Saleem
ae8991493b
supplier added on ppm update, cont.
2 years ago
Sikander Saleem
2a53ab8b8e
electrical safety, asset availability, task status and ppm service added.
2 years ago
Sikander Saleem
7b6b170f23
requester info added.
2 years ago
Sikander Saleem
9c7653109d
request search improvements
2 years ago
Sikander Saleem
564626794b
switching in multiple asset group added.
2 years ago
Sikander Saleem
873b5bcfec
switching in multiple asset group added.
2 years ago
Sikander Saleem
d6c3fc2778
head nurse role added, pending asset service requests added & AssetGroup header added.
2 years ago
Sikander Saleem
cfcb5e24ca
Selected Nurse made not required
2 years ago
Sikander Saleem
db5abda8a1
url update
2 years ago
Sikander Saleem
d858eeace4
improvement.
2 years ago
Sikander Saleem
afd69b6c83
point 39 & 40 done.
2 years ago
Sikander Saleem
981f5f8200
point 36 improvement.
2 years ago
Sikander Saleem
e3954ecfe9
snag point 37,38 done.
2 years ago
Sikander Saleem
28320ff46d
snag point 36 done.
2 years ago
Sikander Saleem
3a4d0a129b
snag point 35 done.
2 years ago
Sikander Saleem
d2e4c8276c
snag points added.
2 years ago
Sikander Saleem
96701730c0
eng can edit device transfer even status is completed.
2 years ago
Sikander Saleem
9101783703
device transfer added in filters
2 years ago
Sikander Saleem
cfa749ab74
text to speech added.
2 years ago
Sikander Saleem
0f849a961d
asset card improvement.
2 years ago
Sikander Saleem
60639620c6
snag issues resolve
2 years ago
Sikander Saleem
b6c08450fe
version 1.1.0 uploaded on stores.
2 years ago
Sikander Saleem
eadf74d54e
pm checklist data fix
2 years ago
Sikander Saleem
f6ea56d907
ppm tbs, next date fix
2 years ago
Sikander Saleem
9f7a9acede
asset room model fix
2 years ago
Sikander Saleem
7132e64bcf
ppm checklist fix
2 years ago
Sikander Saleem
0324c5a7ef
bug 345 fixed, traveling expense & hours in double now
2 years ago
Sikander Saleem
1e514493de
create sub workorder multiple fix
2 years ago
Sikander Saleem
3b812a6952
293 improvement.
2 years ago
Sikander Saleem
828ae74e48
bug 309, 297, 293 fixed.
2 years ago
Sikander Saleem
c7e2736bd8
department name issue fixed on login
2 years ago
Sikander Saleem
ebef7a7d81
loan availability added.
2 years ago
Sikander Saleem
1fbcbd0662
reason api ADDED.
2 years ago
Sikander Saleem
cacd973386
workorder, create ,edit& sub workorder reason fixed.
2 years ago
Sikander Saleem
caa1f975ab
ppm timer & receiver name fixed.
2 years ago
Sikander Saleem
e2750094d9
asset loading fix.
2 years ago
Sikander Saleem
bddc7ded1f
loan availability
2 years ago
Sikander Saleem
668333dd15
timer issue fix on receiver engineer.
2 years ago
Sikander Saleem
98adf93200
rename status to current situation
2 years ago
Sikander Saleem
c3b4e05635
department name added in gas refill detail screen.
2 years ago
Sikander Saleem
2734d17421
improvement
2 years ago
Sikander Saleem
96cb264bf1
ios bundle id changed to com.habib.atoms
2 years ago
Sikander Saleem
44a123b968
apns token for ios.
2 years ago
Sikander Saleem
fcea1395a7
improvement
2 years ago
Sikander Saleem
adba86b10e
snag list remaining 4 points resolved & improvements.
2 years ago
Sikander Saleem
58f5fbab5e
push notifications added.
2 years ago
Sikander Saleem
d217500df4
improvements
2 years ago
Sikander Saleem
26b82fbda0
attachment added on transfer request.
2 years ago
Sikander Saleem
6a19ea1578
on close, ppm request update issue fix
2 years ago
Sikander Saleem
cda5b5cbe5
ppm request no & report status changed
2 years ago
Sikander Saleem
86a9c3c9de
service to return time added.
2 years ago
Sikander Saleem
adab2e36ea
first action time added, comment fixed,
2 years ago
Sikander Saleem
7c928ed58a
cylinder type added in details & gas type unselected fixed.
2 years ago
Sikander Saleem
965ccc3c9f
voice note issue fix in update
2 years ago
Sikander Saleem
7d41050713
improvements
2 years ago
Sikander Saleem
cbafa20df8
when session ended, show dialog to login.
2 years ago
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
ddc62e33ea
setting page improvement
2 years ago
Sikander Saleem
72a8df3e4f
chart improvement
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
7db4bca3b2
receiver name added on transfer detail
2 years ago
Sikander Saleem
a6dd802321
receiver name added on new transfer request & improvements
2 years ago
Sikander Saleem
5d706d89b4
service type added.
2 years ago
Sikander Saleem
c25862b98d
improvement
2 years ago
Sikander Saleem
4d0b18b5a8
room model & gas refill request number added.
2 years ago
Sikander Saleem
2932796068
asset transfer room model & comment added
2 years ago
Sikander Saleem
162ebd38be
gas & transfer request status on open improvement.
2 years ago
Sikander Saleem
1a4b0be678
assistant employee on select fixed.
2 years ago
Sikander Saleem
4f014f9f3f
service request reload, after first action
2 years ago
Sikander Saleem
88108686d0
sender & receiver transfer fix.
2 years ago
Sikander Saleem
528a8301fa
request no added.
2 years ago
Sikander Saleem
35b0a00ffd
all requests screen, wrong data show while switching tabs fixed.
2 years ago
Sikander Saleem
369ae3d949
gas refill comment issue fix.
2 years ago
Sikander Saleem
6bb2b81ac3
improvements & fixes
2 years ago
Sikander Saleem
2c2e968c91
replace new with in progress for engineer
2 years ago
Sikander Saleem
f634dd69bd
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
0b2ef3d114
improvements
2 years ago
nextwo
e42aa6205f
reset button
2 years ago
nextwo
307fd55fa1
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
e612a55d4f
gas refill comments
2 years ago
zaid_daoud
e8415399ed
Fix
2 years ago
zaid_daoud
53b02874a0
Add validation on part no qty field
2 years ago
nextwo
0be6013ec5
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
d3bee4f39a
gas refill comments
2 years ago
Sikander Saleem
4055337a9b
username keyboard issue fix on ios.
2 years ago
Sikander Saleem
eeaa9bef85
improvements.
2 years ago
Sikander Saleem
a7f5fcb911
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
8079646728
timer on device transfer,
2 years ago
nextwo
6b740549a5
my requests pagination + Sender only close sender request Sender,
...
Receiver can do both jobs, sender & receiver.
2 years ago
Sikander Saleem
375a4eab84
progress view improvement
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
50a3560518
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
b463dfe3a6
THE REQUESTS ARE LABELED AS "IN PROGRESS" BUT LISTED BELOW THE "OPEN"
...
The "Type of Request" should be always a maintenance request.
2 years ago
nextwo
8295fd2b1d
values are not shown in overview screen. also on my request screens.
2 years ago
Sikander Saleem
4804dc1839
refresh indicator added.
2 years ago
zaid_daoud
08ada0c275
Spare parts became mandatory only if the callLastSituation is [PART INSTALLATION (id = 12)]
2 years ago
zaid_daoud
4309c509e8
Assistant Engineer can be unselected
2 years ago
zaid_daoud
bd954c6873
Fix visit date issue in work oder details
2 years ago
zaid_daoud
23700d0adf
Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT)
2 years ago
zaid_daoud
8fa3fd4a6e
Fix Calendar Spelling
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
67a224f60a
fix timer issue on update transfer asset & update gas refill
2 years ago
zaid_daoud
58e6118cff
change function name
2 years ago
zaid_daoud
5e4d0927a5
Search for requests by single item.
2 years ago
zaid_daoud
c8a02c828d
Search for requests by single item.
2 years ago
zaid_daoud
598d931564
month picker
2 years ago
zaid_daoud
8914d3bcf8
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
2ac79188d9
change some labels
2 years ago
nextwo
8985ec6a8e
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
151c727861
fix calender bugs
2 years ago
zaid_daoud
47e45463cb
logout button color on light mode
2 years ago
zaid_daoud
8751584b1e
launching whatsapp
2 years ago
zaid_daoud
f88c438022
Apply design changes on labels
2 years ago
zaid_daoud
5e07fd8658
hide floating button from engineer until adding training request
2 years ago
zaid_daoud
bbbd63d150
edit assign employee in sub work order page
2 years ago
zaid_daoud
cb20bf1275
edit assign employee in sub work order page
2 years ago
zaid_daoud
ae9ac5e1ff
edit drawer
2 years ago
zaid_daoud
289d2582dd
high priority icon color
2 years ago
zaid_daoud
b986ca1cc7
high priority color
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
9971416f6f
Enhancements
2 years ago
zaid_daoud
c2eb7b0dad
Enhancements on comments bottom sheet
2 years ago
zaid_daoud
5b9a33c519
Enhancements on Assets Filter
2 years ago
zaid_daoud
2a2142adb3
Enhancements on Assets Filter
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
zaid_daoud
8f7f3998c7
Fix Spare part issue in sub work order
2 years ago
zaid_daoud
1f1b927c37
vendor issue in sub work order fixed
2 years ago
zaid_daoud
cae60c9bdd
vendor issue in sub work order fixed
2 years ago
zaid_daoud
d5060d119f
delivered qty issue on update gas refill
2 years ago
zaid_daoud
76f2623d5d
Fix Asset Type Issue & Add Repair Location Field (Work Order & Sub Work Order)
2 years ago
Sikander Saleem
d813c29802
improvements
2 years ago
zaid_daoud
5eb1ab2755
Enhancements
2 years ago
zaid_daoud
b1e6a6fe64
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
82720bf831
Enhancements
2 years ago
Sikander Saleem
593cecbe55
improvements
2 years ago
Sikander Saleem
e98bd62be9
profile image change improvement
2 years ago
zaid_daoud
7e15a266b1
Enhancements
2 years ago
zaid_daoud
af17525c3c
Enhancements
2 years ago
zaid_daoud
03926a1fd1
Multiple spare parts in all places
2 years ago
zaid_daoud
88048fb11e
Multiple parts in create work order
2 years ago
zaid_daoud
0b9f781dd8
Hide tabs when filter isn't empty
2 years ago
zaid_daoud
cb658f0e60
Enhancements on search and filter reset button
2 years ago
zaid_daoud
27fec0183f
Enhancements on search and filter reset button
2 years ago
zaid_daoud
51ef873770
Reformatting code
2 years ago
zaid.daoud
4f116b1ea4
Update Gas refill issues fixed
2 years ago
zaid.daoud
5bf73172f6
Previous Business Logic in Work order & sub work order
2 years ago
Sikander Saleem
aad9c3dde1
improvements.
2 years ago
nextwo
81afa14ffc
When we have filters, add reset button.
2 years ago
nextwo
7966378016
When we have filters, add reset button.
2 years ago
nextwo
9aba167e1f
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
3e77fb1707
When we have filters, add reset button.
2 years ago
Sikander Saleem
a130780193
chart improvement
2 years ago
Sikander Saleem
686c70e3db
profile image improvement & notificaiton
2 years ago
zaid_daoud
7d50ac3f81
FAB : Eng can only create transfer asset requests
2 years ago
zaid_daoud
a403fb0028
Device Transfer Issued Fixed For Sender & Receiver
2 years ago
zaid_daoud
8800cabf32
Gas refill status color in details screen
2 years ago
zaid_daoud
95b8351ede
First Action Bottom sheet fixed
2 years ago
zaid_daoud
3e07513aeb
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
44406e6cd0
change cards & text fields & timer & date picker bg colors when disabled
2 years ago
nextwo
1e467fc78c
On gas refill detail, there is no date, but we are showing it .
2 years ago
nextwo
df147f3ef1
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
ae71e5a53d
Add timer in gas refill update & also nurse & engineer signatures should be added.
2 years ago
zaid_daoud
6289a72e01
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
042d7df708
Sub work order screen done
2 years ago
Sikander Saleem
09f24edb35
eSignature fixed,
2 years ago
Sikander Saleem
322403f23d
no data text added on work order.
2 years ago
Sikander Saleem
f5b069c318
replace visit date to return to service
2 years ago
Sikander Saleem
4a8deafdde
improvements
2 years ago
nextwo
0a699fe33b
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
6841a8563f
Sub work order screen under testing
2 years ago
zaid_daoud
884471009a
Sub work order screen under testing
2 years ago
zaid_daoud
db3053bc3a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
c64709b7cb
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
3f05bd2988
open request fixed for nurse & enigneer.
2 years ago
Sikander Saleem
31b0eaeb2e
asset image fixed.
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
a602dbe2eb
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
29e414a703
user profile change added & improvements.
2 years ago
zaid_daoud
5de8d33cfd
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
cd3d9e1455
Working on create sub work order screen
2 years ago
nextwo
114a0b9e40
On calendar weekly swipe data calling issue Also on monthly
2 years ago
zaid_daoud
f07a70462a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
zaid_daoud
15c98e873e
Enhancement
2 years ago
Sikander Saleem
708e7c80d1
improvements.
2 years ago
nextwo
ee7665930e
dark / ligth dark & localization
2 years ago
zaid_daoud
34273178ac
Enhancement
2 years ago
zaid_daoud
f1bf45763b
Filter Requests DONE
2 years ago
zaid_daoud
4cf650702f
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
2 years ago
zaid_daoud
dbb26d8cd4
Filter Requests DONE
2 years ago
Sikander Saleem
c8dd3bff46
logic improve for request list in my requests.
2 years ago
Sikander Saleem
c452aee3f9
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
ecacd2ec8f
request list added on my requests.
2 years ago
nextwo
84e6bf70a1
dark / ligth dark & localization
2 years ago
Sikander Saleem
ab83963c65
improvements
2 years ago
Sikander Saleem
f8ba08a44b
ppm flow added.
2 years ago
Sikander Saleem
c6115e5938
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
7ecd90a556
gas refill flow added.
2 years ago
Sikander Saleem
c96f611051
service request flow added & improvements
2 years ago
zaid_daoud
cc089d917f
simple change
2 years ago
zaid_daoud
e29946e280
Search All Requests Done
2 years ago
Sikander Saleem
3c4d8b74e2
my request added.
2 years ago
Sikander Saleem
18e4bf8503
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
34bae463b6
improvements.
2 years ago
zaid_daoud
19ba1f9ad0
Enhancement
2 years ago
Sikander Saleem
de2b6e1265
improvements.
2 years ago
Sikander Saleem
f519841c04
improvements.
2 years ago
Sikander Saleem
b51555c2f4
improvements.
2 years ago
Sikander Saleem
3725adb0aa
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
# lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart
2 years ago
Sikander Saleem
6d0aa0e17c
my requests added.
2 years ago
nextwo
bd33f4cbda
dark / ligth dark
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
zaid_daoud
94ca2d60ef
Calendar API done
2 years ago
zaid_daoud
affb486fbd
Calendar API done
2 years ago
Sikander Saleem
29d83101af
statuses & date added.
2 years ago
nextwo
6f3978c439
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
204305f705
dark / ligth dark
2 years ago
Sikander Saleem
af5144ffa3
all request details model updated.
2 years ago
nextwo
4d07ddc7e8
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
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
nextwo
8b0d9a6ca6
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
2c8af84814
dashboard progress view improvements
2 years ago
Sikander Saleem
89bcb20314
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
2 years ago
Sikander Saleem
17e62a1671
dashboard progress view added.
2 years ago
zaid_daoud
9ce5ca2f09
Improvements
2 years ago
nextwo
1083aa6a8b
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
746691c164
dark / ligth dark
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
Sikander Saleem
8a097a1ed6
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
nextwo
7666364083
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
4ec0b27afa
loclization
2 years ago
Sikander Saleem
67a7fcfe54
improvements.
2 years ago
zaid_daoud
d908fe1c9d
Weekly Calendar Design
2 years ago
zaid_daoud
3af18cb884
Working On Calendar
2 years ago
Sikander Saleem
c93e249519
improvement.
2 years ago
Sikander Saleem
ba1b0ded40
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
# lib/new_views/common_widgets/app_bottom_nav_bar.dart
# lib/new_views/pages/land_page/land_page.dart
# pubspec.yaml
2 years ago
zaid_daoud
9f0de18ea6
Working On Calendar
2 years ago
zaid_daoud
1091af7f23
Working On Calendar
2 years ago
Sikander Saleem
49377d2418
calender cont.
2 years ago
zaid_daoud
456dc4bd77
Testing Dashboard Chart
2 years ago
Sikander Saleem
63cbbe48d1
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
e3fbcae6d3
recent activities added.
2 years ago
Sikander Saleem
fe624596a1
request fragment added on dashboard.
2 years ago
zaid_daoud
fc4bfca61b
Fix preventive maintenance status colors
2 years ago
zaid_daoud
649ddf6c01
Fix preventive maintenance status colors
2 years ago
zaid_daoud
a5393b5a85
Fix loading issue in comments bottom sheet
2 years ago
zaid_daoud
37a9cd3cc9
service request comment done
2 years ago
zaid_daoud
ce143947d1
Survey Screen Needs APIs to be DONE
2 years ago
zaid_daoud
1ccb8cdcb4
Help Center Screen
2 years ago
zaid_daoud
675572be40
Profile Screen DONE
2 years ago
zaid_daoud
5e1d6517de
Change Notifications Screen Design DONE
2 years ago
zaid_daoud
8226cd3702
Settings Screen 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
9c43eab5db
device transfer
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
c3d6643ead
Enhancements
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
98c68bfbf0
search work order by assigned employee fixed.
2 years ago
zaid_daoud
18d0bdbd60
Fix Service Details Design
2 years ago
Sikander Saleem
c9f903fac8
urgent improvements.
2 years ago
zaid_daoud
477e6751aa
Enhancements
2 years ago
zaid_daoud
19845bd9d8
Enhancements
2 years ago
zaid_daoud
c281fba1ac
Enhancements
2 years ago
zaid_daoud
73d090cb9e
Edit wo only for eng
2 years ago
zaid_daoud
7a06f251be
Create New Work Order Done
2 years ago
zaid_daoud
743bb28b1d
Create New Work Order Done
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
43b2f18a1a
New Work Order [In Progress]
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
6258035a88
add room field to asset transfer
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
39515c48ad
Merged
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
b4ea88e7db
_
2 years ago
zaid_daoud
84c9efda5a
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
...
# Conflicts:
# lib/l10n/app_en.arb
2 years ago
zaid_daoud
e419b17bd1
Service request design done
2 years ago
Sikander Saleem
0e30fef10c
work order list ui changed.
2 years ago
Sikander Saleem
0170c6f5cb
service request status color improvement.
2 years ago
Sikander Saleem
2d553b56e0
service request detail ui changed.
2 years ago
nextwo
8f11ef577e
gas refill
2 years ago
nextwo
64b249a0cd
gas refill
2 years ago
Sikander Saleem
ec4d4a9193
merge conflict resolved.
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
c8e3f2df48
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
2 years ago
Sikander Saleem
392182e234
track service request cont.
2 years ago
zaid_daoud
4bffab9c9b
Request Gas refill screen Done
2 years ago
Sikander Saleem
050c710bf8
android 1.0.4 released.
2 years ago
Sikander Saleem
150ad60de6
track service request
2 years ago
Sikander Saleem
df4a9a4887
revert code for existing functionality
2 years ago
zaid_daoud
b673cd8a2b
Gas refill screen
2 years ago
zaid_daoud
c66acbd1ee
Gas refill screen
2 years ago
zaid_daoud
b77a36ac50
Gas refill screen
2 years ago
zaid_daoud
b1e93abf4d
Gas refill design without submit button
2 years ago
zaid_daoud
ed759f5dcf
Still working on gas refill request
2 years ago
zaid_daoud
085674ee18
adding radio buttons for theme
2 years ago
zaid_daoud
bb1a516f0a
add the old route
2 years ago