Commit Graph

Select branches

Hide Pull Requests

Assign_Project

Collection_Purchase_Widget

Dashboard_Charts

Dashboard_Expense_Widgets_OFW

Decription_Feature

Dev_Manish

Dev_Manish_17/11

Dev_Manish_24/11

Dev_Manish_Bug

Feature_Document

Feature_Dynamic_Menu

Feature_Expense

Feature_Firebase_Notification

Feature_Global_Project_Selection

Feature_MPIN_OTP

Feature_PR

Feature_Push_Notification

Feature_Report_Action

Feature_Theme_Chnage_Main

Firebase_Final_Code

Issue_10_10_2025

Migration_To_Main

OH_Dev_Manish

OnFieldWork

PR_Dev_Manish

PR_Dev_Vaibhav

Service_Project_Branching

Service_Project_Feature

Task-#188

Tenant_Selection_Issue_Fixed

Vaibhav_Bug-#211

Vaibhav_Bug-#220

Vaibhav_Bug-#290

Vaibhav_Bug-#292

Vaibhav_Bug-#411

Vaibhav_Bug-#427

Vaibhav_Bug-#431

Vaibhav_Bug-#435

Vaibhav_Bug-#437

Vaibhav_Bug-#450

Vaibhav_Bug-#451

Vaibhav_Bug-#452

Vaibhav_Dev

Vaibhav_Enhancement-#1129

Vaibhav_Enhancement-#1253

Vaibhav_Enhancement-#267_Bug-#259_Bug-#255_Enhancement-#264

Vaibhav_Enhancement-#283

Vaibhav_Enhancement-#289

Vaibhav_Enhancement-#296

Vaibhav_Enhancement-#312

Vaibhav_Enhancement-#313

Vaibhav_Enhancement-#314

Vaibhav_Enhancement-#419

Vaibhav_Enhancement-#454

Vaibhav_Feature-#101

Vaibhav_Feature-#109

Vaibhav_Feature-#541

Vaibhav_Feature-#768

Vaibhav_Feature-Logger

Vaibhav_Feature_Firebase

Vaibhav_Issue_17_07_2025

Vaibhav_Issues_18_08_2025

Vaibhav_NoInternet_Feature

Vaibhav_Refactoring-#169

Vaibhav_Task#218

Vaibhav_Task-#100

Vaibhav_Task-#102

Vaibhav_Task-#1177

Vaibhav_Task-#118

Vaibhav_Task-#131

Vaibhav_Task-#136

Vaibhav_Task-#147

Vaibhav_Task-#175

Vaibhav_Task-#176

Vaibhav_Task-#179

Vaibhav_Task-#200

Vaibhav_Task-#323

Vaibhav_Task-#428

Vaibhav_Task-#515

Vaibhav_Task-#519

Vaibhav_Task-#729

Vaibhav_Task-#742

Vaibhav_Task-#961

feature/inventory

feature/payment

main

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#9

Mono Color

• bf03023db7 done landscape responsive of all screen Manish 2025-11-18 10:50:50 +05:30
• c69e4280ef Merge pull request 'Service_Project_Branching' (#82) from Service_Project_Branching into main vaibhav.surve 2025-11-24 06:32:57 +00:00
• 4518504fe5 Merge branch 'Dev_Manish_17/11' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into Dev_Manish_17/11 Manish 2025-11-24 11:24:15 +05:30
• dc734e96d0 done tags UX updates Manish 2025-11-24 10:16:41 +05:30
• 490ecbc567 UI enhancement Manish 2025-11-21 17:36:56 +05:30
• e6eb0178c0 check box color change to white Manish 2025-11-21 16:17:00 +05:30
• 40467074ca upadted with select enployee sheet Manish 2025-11-21 16:04:40 +05:30
• 3c08ee447c unwanted code removed Manish 2025-11-20 12:00:28 +05:30
• c6c11cc6fc advance paymen Manish 2025-11-20 11:57:13 +05:30
• d83bc838f4 added multiselect bottom sheet in assign task bottom sheet form Manish 2025-11-18 17:13:44 +05:30
• 6bae9e389c Done all screen landscape responsive for mobile and tablet Manish 2025-11-18 16:25:25 +05:30
• c4897bccc8 done landscape responsive of all screen Manish 2025-11-18 10:50:50 +05:30
• a11fc80050 UI enhancement Manish 2025-11-21 17:36:56 +05:30
• 02758a03bf check box color change to white Manish 2025-11-21 16:17:00 +05:30
• 2e45d0de81 upadted with select enployee sheet Manish 2025-11-21 16:04:40 +05:30
• 40e8a0d911 unwanted code removed Manish 2025-11-20 12:00:28 +05:30
• d3e3061d31 advance paymen Manish 2025-11-20 11:57:13 +05:30
• a9fa0448e3 done with employee list dropdown updation Manish 2025-11-18 17:49:26 +05:30
• b9847e03b1 added multiselect bottom sheet in assign task bottom sheet form Manish 2025-11-18 17:13:44 +05:30
• 380b6d3552 Done all screen landscape responsive for mobile and tablet Manish 2025-11-18 16:25:25 +05:30
• c6419c0737 done landscape responsive of all screen Manish 2025-11-18 10:50:50 +05:30
• 761cd1f7e8 chore: update version number to 1.0.0+16 in pubspec.yaml Service_Project_Branching Vaibhav Surve 2025-11-24 10:28:02 +05:30
• 3ff97eb0d8 done tags UX updates Manish 2025-11-24 10:16:41 +05:30
• 516d6b0489 feat: enhance notification action handling and add refresh indicators in ServiceProjectDetailsScreen Vaibhav Surve 2025-11-22 16:17:17 +05:30
• e9075dcdf5 feat: add project name support in CustomAppBar and related screens for improved context Vaibhav Surve 2025-11-22 15:15:38 +05:30
• 5c53a3f4be Refactor project structure and rename from 'marco' to 'on field work' Vaibhav Surve 2025-11-22 14:20:37 +05:30
• da1508b4e0 Merge branch 'Dev_Manish_17/11' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into Dev_Manish_17/11 Manish 2025-11-22 11:58:32 +05:30
• 19e6979c0e UI enhancement Manish 2025-11-21 17:36:56 +05:30
• 84395765fd check box color change to white Manish 2025-11-21 16:17:00 +05:30
• 6162b9be89 upadted with select enployee sheet Manish 2025-11-21 16:04:40 +05:30
• 39d0f96ecd unwanted code removed Manish 2025-11-20 12:00:28 +05:30
• 270d24ed8c advance paymen Manish 2025-11-20 11:57:13 +05:30
• 170ff050c4 done with employee list dropdown updation Manish 2025-11-18 17:49:26 +05:30
• 7a9673e2c2 added multiselect bottom sheet in assign task bottom sheet form Manish 2025-11-18 17:13:44 +05:30
• 125a09c772 Done all screen landscape responsive for mobile and tablet Manish 2025-11-18 16:25:25 +05:30
• 261cba9dcf done landscape responsive of all screen Manish 2025-11-18 10:50:50 +05:30
• 8cbefbb9e8 UI enhancement Manish 2025-11-21 17:36:56 +05:30
• 603e7ee7e5 feat: add advance payment indicator in payment request screens and improve code formatting Vaibhav Surve 2025-11-21 16:57:37 +05:30
• 2c98ac359c feat: enhance payment request data models for null safety and improve filter options handling in PaymentRequestController Vaibhav Surve 2025-11-21 16:42:33 +05:30
• fc78806af2 feat: implement job search functionality and archived job toggle in JobsTab; refactor ServiceProjectDetailsScreen to integrate JobsTab Vaibhav Surve 2025-11-21 16:33:09 +05:30
• 3e317328b2 check box color change to white Manish 2025-11-21 16:17:00 +05:30
• 542f27635a upadted with select enployee sheet Manish 2025-11-21 16:04:40 +05:30
• cf7021a982 feat: refactor ExpenseDetailScreen to use tagged controller for improved state management Vaibhav Surve 2025-11-20 18:02:03 +05:30
• efefb1c34b feat: add app version display to user profile bar and update version number in pubspec.yaml Vaibhav Surve 2025-11-20 17:19:48 +05:30
• 846ca64402 feat: update project fetching method to use getGlobalProjects for improved data retrieval Vaibhav Surve 2025-11-20 16:52:51 +05:30
• 765f537cf9 feat: enhance tenant fetching logic to handle empty responses and invalid JSON gracefully Vaibhav Surve 2025-11-20 16:33:08 +05:30
• 87a7d19672 feat: enhance job detail screen to display project branch information and improve payment request handling Vaibhav Surve 2025-11-20 16:21:41 +05:30
• a03876bdb7 unwanted code removed Manish 2025-11-20 12:00:28 +05:30
• aa846f1a55 advance paymen Manish 2025-11-20 11:57:13 +05:30
• d0b40a9822 feat: enhance JSON parsing in ServiceProjectAllocationResponse and related models to handle null values gracefully Vaibhav Surve 2025-11-20 11:55:15 +05:30
• c44d10d35a feat: update JobDetailsResponse and JobData models to support nullable fields and improve JSON parsing Vaibhav Surve 2025-11-20 11:12:59 +05:30
• 6515a511ee done with employee list dropdown updation Manish 2025-11-18 17:49:26 +05:30
• abbe3f3896 added multiselect bottom sheet in assign task bottom sheet form Manish 2025-11-18 17:13:44 +05:30
• 0b4f429f54 Done all screen landscape responsive for mobile and tablet Manish 2025-11-18 16:25:25 +05:30
• c94efac1de done landscape responsive of all screen Manish 2025-11-18 10:50:50 +05:30
• 02ef996753 feat: update projectBranchId field in API service and increment version to 1.0.0+14 Vaibhav Surve 2025-11-20 09:58:36 +05:30
• ec6a45ed43 feat: integrate snackbar notifications for document and job updates in user document controller and job detail screen Vaibhav Surve 2025-11-19 17:29:10 +05:30
• 92c739045c feat: rename Expense Type to Expense Category across controllers, models, and views for consistency Vaibhav Surve 2025-11-19 17:20:44 +05:30
• 5dd09869ad feat: enhance ExpenseDetailModel and ExpenseDetailScreen with additional fields and improved UI structure Vaibhav Surve 2025-11-19 17:17:04 +05:30
• 8edd189479 feat: add branch selection functionality and API integration for service project jobs Vaibhav Surve 2025-11-19 16:36:32 +05:30
• bbadcc4139 feat: update API endpoints and enhance attendance log handling in job detail screen Vaibhav Surve 2025-11-19 15:44:55 +05:30
• d05e26bc87 feat: enhance date range picker logic to restrict date selection and improve validation Service_Project_Feature Vaibhav Surve 2025-11-19 12:19:47 +05:30
• 49326e9929 feat: enhance employee selection and validation in service project job form Vaibhav Surve 2025-11-19 12:00:26 +05:30
• 0e575c393d feat: enhance job fetching logic and add auto-refresh after job addition Vaibhav Surve 2025-11-19 11:28:39 +05:30
• 804f0eba7b enhansed ui Vaibhav Surve 2025-11-18 17:50:47 +05:30
• 253aa55a80 added manage team Vaibhav Surve 2025-11-18 17:44:12 +05:30
• 17fc04f3ee feat: add cached_network_image dependency and improve image handling in attendance logs Vaibhav Surve 2025-11-18 12:11:30 +05:30
• 474ecac53c refactor: improve null safety in employee details and enhance UI handling Vaibhav Surve 2025-11-18 11:17:33 +05:30
• dc4ea7979c resoled payment request model crash issue Vaibhav Surve 2025-11-18 10:57:46 +05:30
• 618ac6f27a chore: update package name and bundle identifier to com.marcoonfieldwork.aiot Vaibhav Surve 2025-11-17 20:17:14 +05:30
• 2260382990 refactor: enhance job attendance handling and improve null safety in models Vaibhav Surve 2025-11-17 18:03:59 +05:30
• 919310644d added tag in tag out api and code Vaibhav Surve 2025-11-17 17:36:11 +05:30
• 605617695e refactor: improve code readability and consistency in JobDetailsScreen Vaibhav Surve 2025-11-17 16:02:03 +05:30
• 4d47ee3002 fixed issues Vaibhav Surve 2025-11-17 15:23:51 +05:30
• 9dd66bd297 Merge pull request 'OH_Dev_Manish' (#81) from OH_Dev_Manish into Service_Project_Feature manish.zure 2025-11-17 09:48:29 +00:00
• f506bd1bfc Merge branch 'OH_Dev_Manish' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into OH_Dev_Manish OH_Dev_Manish Vaibhav Surve 2025-11-17 15:16:01 +05:30
• 39abfa2260 Rebase issues solved Manish 2025-11-17 11:32:07 +05:30
• ed88e0dfc9 implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• a910d37f22 All Employees fetching task done in advance payment screen Manish 2025-11-13 15:27:13 +05:30
• 2df4afcea7 implementation of manage reporting inside employee profile Manish 2025-11-12 17:17:01 +05:30
• ceee12df33 implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• 58ed2676e3 implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• e1b6794e15 made chnages in details screen and list screen Vaibhav Surve 2025-11-12 16:48:53 +05:30
• 01f3cd24da added service projet screen Vaibhav Surve 2025-11-12 15:36:10 +05:30
• a8b31b3a95 All Employees fetching task done in advance payment screen Manish 2025-11-13 15:27:13 +05:30
• b9195c7fdd .. Manish 2025-11-13 11:30:36 +05:30
• be835bd2bd implementation of manage reporting inside employee profile Manish 2025-11-12 17:17:01 +05:30
• 2d35addeeb implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• e3fe3c0d86 implementation of manage reporting inside employee profile Manish 2025-11-12 17:17:01 +05:30
• b8aefc544f implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• 58c6a3f9af All Employees fetching task done in advance payment screen Manish 2025-11-13 15:27:13 +05:30
• 1f694381a1 .. Manish 2025-11-13 11:30:36 +05:30
• ba6d58fd0a implementation of manage reporting inside employee profile Manish 2025-11-12 17:17:01 +05:30
• e9a43af350 implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• fdd2d51ed0 implementation of manage reporting inside employee profile Manish 2025-11-12 17:17:01 +05:30
• cddc2990fb created new emploee selector bottomsheet Vaibhav Surve 2025-11-14 15:35:41 +05:30
• 3974ae8a4c Merge branch 'OH_Dev_Manish' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into OH_Dev_Manish Vaibhav Surve 2025-11-17 15:09:21 +05:30
• 68ed97b64a Rebase issues solved Manish 2025-11-17 11:32:07 +05:30
• 793eeec7fa Rebase issues solved Manish 2025-11-17 11:32:07 +05:30
• 29af4e53a9 implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30