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 |
|
zaid_daoud
|
a8e7d26355
|
Back to the old dashboard
|
2 years ago |
|
zaid_daoud
|
651477ec0d
|
Improvements
|
2 years ago |
|
zaid_daoud
|
decd48cdd2
|
Improvements
|
2 years ago |
|
Sikander Saleem
|
3df1bf70ca
|
improvements
|
2 years ago |
|
zaid_daoud
|
683ff899c2
|
Improvements on login_page.dart
|
2 years ago |
|
zaid_daoud
|
e49399de45
|
Improvements on login_page.dart
|
2 years ago |
|
zaid_daoud
|
1db543710e
|
Working on gas request screen
|
2 years ago |
|
zaid_daoud
|
3bdae42769
|
1- change text form field code
2- app bar design
3- working on request gas refill screen
|
2 years ago |
|
zaid_daoud
|
5ded8e4386
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
9c25b6d2e0
|
Add Submit Button To the new requests screens
|
2 years ago |
|
zaid_daoud
|
8e315d54d0
|
Default App Bar
|
2 years ago |
|
zaid_daoud
|
42deeeb104
|
new service request page
|
2 years ago |
|
zaid_daoud
|
1f4fbee83b
|
floating button animation
|
2 years ago |
|
zaid_daoud
|
5bfd6924e1
|
text form field alignment
|
2 years ago |
|
zaid_daoud
|
83980f9b0c
|
Add Language Switch to the drawer
|
2 years ago |
|
zaid_daoud
|
22e3067d05
|
Floating button theme
|
2 years ago |
|
zaid_daoud
|
95eac4b196
|
Call Us bottomsheet
|
2 years ago |
|
zaid_daoud
|
ebb7c114a2
|
Dashboard Name
|
2 years ago |
|
zaid_daoud
|
a0373de566
|
Fix Home App Bar
|
2 years ago |
|
zaid_daoud
|
0513fe1bc0
|
Fix Home App Bar
|
2 years ago |
|
zaid_daoud
|
905e430549
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
06152bee2f
|
Fix Bottom Nav Bar Style
|
2 years ago |
|
zaid_daoud
|
c10cb10fe0
|
Merged with Majd
|
2 years ago |
|
nextwo
|
b0992da201
|
app bar
nav bar
|
2 years ago |
|
zaid_daoud
|
dd524bcbd1
|
Merged with Majd
|
2 years ago |
|
nextwo
|
e20f3b5433
|
app bar
nav bar
|
2 years ago |
|
zaid_daoud
|
05398a9f76
|
Enhancement
|
2 years ago |
|
zaid_daoud
|
a8a7b5a613
|
Activate light and dark theme
|
2 years ago |
|
zaid_daoud
|
5a645f13c0
|
class renaming
|
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 |
|
zaid_daoud
|
3b3de831f0
|
Preparing new style (theme & colors)
|
2 years ago |
|
zaid_daoud
|
6ef281d604
|
Add New Views Folder
|
2 years ago |
 Sikander Saleem
|
f0c605b07d
|
improvements
|
2 years ago |
|
Sikander Saleem
|
71ccd100b5
|
Merge branch 'zaid_development_new' into sikander-development
# Conflicts:
# lib/controllers/api_routes/urls.dart
|
2 years ago |
|
zaid_daoud
|
630a4e1b9d
|
Add (mr number) field to the WO details bottom sheet
|
2 years ago |
|
zaid_daoud
|
2d0c72b138
|
1- prevent the user from creating a new gas refill request if the department isn't selected.
2- working on host: https://atomsmdev.hmg.com
|
2 years ago |
|
Sikander Saleem
|
088e980b18
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
d1d83bb614
|
Fixing sub work order issue
|
2 years ago |
|
Sikander Saleem
|
00ba893bf2
|
fixes.
|
2 years ago |
|
Sikander Saleem
|
5fc2aceecf
|
ppm disable edit on closed, gaz refill site fix, & print statements remove.
|
2 years ago |
|
Sikander Saleem
|
09f2ae32eb
|
improvements
|
2 years ago |
|
zaid_daoud
|
253ce67deb
|
Fixing sub work order issue
|
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
|
5c14375d6f
|
Fixing PPM issues
|
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
|
3e314447c6
|
Fix building, floor, room issue when edit sender or receiver
|
2 years ago |
|
nextwo
|
a85ea2d799
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |
|
nextwo
|
7d37d66e62
|
fix bugs
|
2 years ago |
|
zaid_daoud
|
a26684de11
|
Device Status in PM Entry
|
2 years ago |
|
Sikander Saleem
|
300bc0a1a6
|
improvements
|
2 years ago |
|
Sikander Saleem
|
dc983f0db4
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
ea5738f705
|
Gas refill update reflected on the details screen
|
2 years ago |
|
zaid_daoud
|
fe1885b367
|
Fix asset destination issue
|
2 years ago |
|
zaid_daoud
|
f1bb4117e2
|
Add asset floor and room to create asset transfer screen
|
2 years ago |
|
zaid_daoud
|
05d3b7dd5d
|
department name shown in the gas refill details screen & the delivered quantity is reflected on the details screen
|
2 years ago |
|
zaid_daoud
|
0dd9400c91
|
Sorting gaz refill using mostRecent key
|
2 years ago |
|
Sikander Saleem
|
6e0ff34499
|
improvements
|
2 years ago |
|
zaid_daoud
|
58c5b434e2
|
Fault Desc Issue Fixed
|
2 years ago |
|
nextwo
|
8df2900254
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |
|
nextwo
|
350ea3f9e7
|
fix bugs
|
2 years ago |
|
zaid_daoud
|
2384bab11f
|
Fault Desc Issue Fixed
|
2 years ago |
|
Sikander Saleem
|
d63a18226a
|
ppm attachments fix
|
2 years ago |
|
zaid_daoud
|
a9d4d2a373
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
a41944e78a
|
Enhancements
|
2 years ago |
|
zaid_daoud
|
dc2dab5869
|
Multiple Images Everywhere
|
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
|
bf30e1d763
|
update service request attachment fixed.
|
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 |
|
zaid_daoud
|
7d68d1db51
|
Fix
|
2 years ago |
|
zaid_daoud
|
f5820a93c7
|
Enhancement
|
2 years ago |
|
zaid_daoud
|
8c018158ae
|
Vendors Will Be Visible If Previous Data API contains data
|
2 years ago |
|
Sikander Saleem
|
8624515433
|
local & network files opener added.
|
2 years ago |
|
zaid_daoud
|
b908322f06
|
1- [WO Details] Get Vendor Name And Engineer According To Last Status
|
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 |
|
zaid_daoud
|
6fc8e9b02c
|
Return to service isn't required
|
2 years ago |
|
Sikander Saleem
|
f3349b0209
|
improvements.
|
2 years ago |
|
Sikander Saleem
|
9b2c1c8f8d
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
ec4916d4ec
|
hide create service request module form engineer session
|
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
|
232713f841
|
Track Gaz Refills [Most Recent]
|
2 years ago |
|
zaid_daoud
|
c52d7cd527
|
Preventive Maintenance [Most Recent]
|
2 years ago |
|
zaid_daoud
|
0e95b32ecb
|
Service Request [Most Recent]
|
2 years ago |
|
zaid_daoud
|
0f9d4127b4
|
[SubWorkOrder]: Auto Filled Fields Depending on ParentId
|
2 years ago |
|
Sikander Saleem
|
4efcf9d787
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
60f6cbf1b8
|
Voice Note Issue Fixed
|
2 years ago |
|
zaid_daoud
|
61c28aa8b8
|
FIX
|
2 years ago |
|
zaid_daoud
|
8932871e12
|
Back to the previous commit
|
2 years ago |
|
zaid_daoud
|
6145f8a0cb
|
Fix
|
2 years ago |
|
Sikander Saleem
|
da7ce0ac52
|
Merge remote-tracking branch 'origin/sikander-development' into sikander-development
|
2 years ago |
|
Sikander Saleem
|
6453c932ab
|
improvements
|
2 years ago |
|
Sikander Saleem
|
ef2431d7df
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
d277a28f54
|
Activate Attachment Picker Dialog with a New Field (Pick From Files)
|
2 years ago |
|
Sikander Saleem
|
1839536caa
|
image url updated
|
2 years ago |
|
Sikander Saleem
|
1eaf9a21fa
|
asset transfer status fixed.
|
2 years ago |
|
Sikander Saleem
|
07c8acf3a3
|
improvement
|
2 years ago |
|
zaid_daoud
|
bf39badc3d
|
enhancement
|
2 years ago |
|
zaid_daoud
|
6c2480edd2
|
stop loading on null values
|
2 years ago |
|
zaid_daoud
|
4cbedc0b60
|
add start and end time to gas refill details
|
2 years ago |
|
Sikander Saleem
|
2549157eee
|
rename fixes.
|
2 years ago |
|
Sikander Saleem
|
c9155eb852
|
Merge branch 'zaid_development_new' into sikander-development
|
2 years ago |
|
zaid_daoud
|
4193b42985
|
fix
|
2 years ago |
|
zaid_daoud
|
9bc4f67995
|
fix
|
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
|
5f21d4e5c9
|
Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
|
2 years ago |
|
nextwo
|
eee1b0dc51
|
fix bugs
|
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 |
|
nextwo
|
648d48e486
|
Merge branch 'zaid_development_new' into majd_development_new
|
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
|
e32de37209
|
Improve most recent filter
|
2 years ago |
|
zaid_daoud
|
a3264f4f1c
|
Multiple types of attachments
|
2 years ago |
|
Sikander Saleem
|
591e1513a2
|
enable sub workorder & name to create
|
2 years ago |
|
nextwo
|
d33c97d1df
|
make return to service not required
|
2 years ago |
|
zaid_daoud
|
799c9a50bd
|
nothing
|
2 years ago |
|
nextwo
|
f5bc07c3a2
|
Merge branch 'zaid_development_new' into majd_development_new
|
2 years ago |
|
nextwo
|
f132004c11
|
remove expected date
|
2 years ago |
|
zaid_daoud
|
871274433b
|
Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
|
2 years ago |
|
zaid_daoud
|
7a02b2e715
|
fault description is disabled when create new work order
|
2 years ago |
|
Sikander Saleem
|
b02a4ab1fc
|
Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
|
2 years ago |
|
Sikander Saleem
|
311c8c974d
|
gaz refill status fix, when change from web.
|
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 |
|
zaid_daoud
|
13d4b71128
|
sender & receiver issue
|
2 years ago |
|
zaid_daoud
|
349ac7dba4
|
Simple Updates
|
2 years ago |
|
zaid_daoud
|
bd299e2a6d
|
Some changes on work orders model attributes & change File Base Url (Still under testing)
|
2 years ago |