zaid_development_new #1

Merged

sikandersaleem merged 56 commits from zaid_development_new into main_latest_merged

zaid.daoud commented

Sub work order is Ready for testing

zaid.daoud added 40 commits

83bf02e69f Track Gaz Refill Done

1381d54208 Create Gas Refill Bug Fixed

7ed8f86ba2 Create Gas Refill Bug Fixed

7828e52c64 Fixing

c24fe473ff Add Delivered Quantity Field

08841c7859 Update gas refill issue fixed

d470a19bef Need some enhancements

79edef1d66 Update Gas Refill done

10604b4f5c Fixing Bug

dadc591fcf Fixing Bug

de7aff6b9f imp

b9263ae1d8 Merge branch 'main_latest_merged' into zaid_development_new

# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/models/subtitle.dart

8c752c3a05 merge fix.

674a803189 Fixing Bug

33758f4cfd Test

27d3a74d3b Search Sub Work Order Screen DONE

d13bfa5f60 Wo Details Bottom Sheet & Spare Parts Bottom Sheet Design Done

[without activating update buttons]

e2a2104087 Preparing the functionality [Still doesn't work]

4fac73cd67 Preparing the functionality [Still doesn't work]

8646b8f1e9 work order

47e744f481 Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new

# Conflicts:
#	lib/views/pages/sub_workorder/search_sub_workorder_page.dart

b8ea1ab030 work order

ebd9297646 Update Work order [Sub work orders]

19cee08954 Updating Search Work Order Model

73cc2143bc work order

fea1f31474 Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new

# Conflicts:
#	lib/views/pages/sub_workorder/create_sub_workorder_page.dart
#	lib/views/pages/sub_workorder/workorder_details.dart
#	lib/views/pages/sub_workorder/workorder_update.dart

342cf3968b Fixing Bug

1fa14c1a86 work order

6db92bc08d Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new

52eee5196f work order

ffaa340d9d Enhancements

6aab5e6750 Enhancements

e0d2f8360e Enhancements

3010458cd8 Enhancements

f97712e434 work order

912a306e9e Merge remote-tracking branch 'origin/zaid_development_new' into majd_development_new

# Conflicts:
#	lib/views/pages/sub_workorder/create_sub_workorder_page.dart

7d7594a3ab work order

575005ebdd Enhancements

a1f2960fad Enhancements

8f05983c14 Ready For Testing

zaid.daoud requested review from Haroon6138

zaid.daoud self-assigned this

majdalattari was assigned by zaid.daoud

sikandersaleem added 1 commit

4d70fe2c36 improvements

sikandersaleem added 1 commit

a2edcadc1a edit work order added.

sikandersaleem added 1 commit

da911ea7ae fixes

sikandersaleem added 1 commit

74dc2be238 add sub workorder fix

sikandersaleem added 1 commit

147351bd10 add sub workorder fix

zaid.daoud added 1 commit

45b66e6b2a Convert (Start Date & End Date) to Timer

zaid.daoud added 1 commit

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.

zaid.daoud added 1 commit

9cf9c7f30c - New Gas Refill -> Status Disabled With ("Open") default value.