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

• 340d0b8a1e implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• 8fb65d31e2 Merge branch 'Service_Project_Feature' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into Service_Project_Feature Vaibhav Surve 2025-11-12 12:07:10 +05:30
• 7f756f3d4c implementation of Manage reporting Manish 2025-11-12 12:04:35 +05:30
• d2c7f92a02 added routes Vaibhav Surve 2025-11-11 14:21:54 +05:30
• 6b56351a49 displayed possible filds in details screen Vaibhav Surve 2025-11-12 11:53:43 +05:30
• 5db53c29df added validation for payment request in and expense reumbersemrnt bottomsheet Vaibhav Surve 2025-11-12 11:23:13 +05:30
• be2f97cc0e fixed the make expense button display issue on creaying expense also Vaibhav Surve 2025-11-11 19:34:54 +05:30
• 44bbbf9bfb fixed the assign project to eployeee issue after creating employee and added fabicon on expense details screen for assign to project Vaibhav Surve 2025-11-11 19:21:53 +05:30
• f62b7d924b fixed add and edit expense issue Vaibhav Surve 2025-11-11 18:50:13 +05:30
• ee9c94dc86 fixed the wrong time display Vaibhav Surve 2025-11-11 18:07:20 +05:30
• 3e99fc67a3 added widgets in finance screen Vaibhav Surve 2025-11-11 17:25:42 +05:30
• cffa4456b9 fixed wrong list display due to date format , and added tds calculation in the payment proceed sheet Vaibhav Surve 2025-11-11 17:03:06 +05:30
• af5bfcaa59 replaced fab icon with icon on page Vaibhav Surve 2025-11-11 16:12:13 +05:30
• 7f0c4d075d fixed the no data building are dispalyed Vaibhav Surve 2025-11-11 15:27:19 +05:30
• fe950c5b07 fixed pegination and for rejected status no data displayed Vaibhav Surve 2025-11-11 14:55:37 +05:30
• 034de5a601 added permission for create payment request button Vaibhav Surve 2025-11-11 14:38:05 +05:30
• 77a6d50571 added dynamic menu for finance cards as per expense title Vaibhav Surve 2025-11-11 14:31:16 +05:30
• 077dbf35ee added routes Vaibhav Surve 2025-11-11 14:21:54 +05:30
• f232ab42b0 Merge branch 'Service_Project_Feature' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into Service_Project_Feature Vaibhav Surve 2025-11-11 14:21:01 +05:30
• 3543770654 made chnages to expense category of type Vaibhav Surve 2025-11-11 12:53:55 +05:30
• 1dc68033df fixed category issue while updating and adding expense Vaibhav Surve 2025-11-11 12:48:57 +05:30
• b1f5fb8d78 chnaged expense type to category Vaibhav Surve 2025-11-10 16:39:25 +05:30
• 8d688f2575 fixed date pickering issue Vaibhav Surve 2025-11-10 16:22:44 +05:30
• 502bb1e2d9 fixed add remove doscument Vaibhav Surve 2025-11-10 16:10:45 +05:30
• a88d085001 fixed the loading issue Vaibhav Surve 2025-11-10 14:38:10 +05:30
• fd57686c8a corrected the attachment issue Vaibhav Surve 2025-11-10 12:57:32 +05:30
• ef4329530a ... PR_Dev_Vaibhav Manish 2025-11-10 12:13:17 +05:30
• fd5ea9a1b3 edit payment request Manish 2025-11-10 12:10:04 +05:30
• fd861b3adb chnaged make expense flow Vaibhav Surve 2025-11-10 12:08:07 +05:30
• 1c253df5f9 fixed the expense screen neigation build issue Vaibhav Surve 2025-11-10 10:26:03 +05:30
• 92f7fec083 added payment request screens Vaibhav Surve 2025-11-08 16:18:26 +05:30
• 1070f04d1a added finance code Vaibhav Surve 2025-11-08 15:46:28 +05:30
• eb46194679 made chnages in employee details screen Vaibhav Surve 2025-11-08 12:17:17 +05:30
• 910bb5e6b4 removed employees by project Vaibhav Surve 2025-11-08 11:53:34 +05:30
• 546084c9f3 added skeleton for the payment request screen Vaibhav Surve 2025-11-07 18:13:23 +05:30
• 44674da8ac added process flow and make payment functionallity Vaibhav Surve 2025-11-07 17:19:56 +05:30
• 976bb98ba0 implementation of Advance Payment feature inside Finance module PR_Dev_Manish Manish 2025-11-07 16:41:36 +05:30
• a2cf65fb86 chnages the size of the payee and the date Vaibhav Surve 2025-11-06 17:56:15 +05:30
• f55cf343fb added code for payement request and payment request details screen Vaibhav Surve 2025-11-06 17:44:18 +05:30
• 1a6ad4edfc made chnages in request payment Vaibhav Surve 2025-11-06 12:21:53 +05:30
• 42c2739d0c added fab icon Vaibhav Surve 2025-11-05 17:37:32 +05:30
• 0954e46c61 Merge branch 'PR_Dev_Vaibhav' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into PR_Dev_Vaibhav Vaibhav Surve 2025-11-05 17:30:38 +05:30
• 350081f6b6 added payment request code Vaibhav Surve 2025-11-05 17:30:07 +05:30
• ac01ee8e47 added payment request code Vaibhav Surve 2025-11-05 17:30:07 +05:30
• 0b0c072473 updates finance screen Feature_PR Vaibhav Surve 2025-11-05 17:26:32 +05:30
• a2f5414240 Merge pull request 'feat: Enhance FinanceScreen with animation and improved UI components' (#80) from PR_Dev_Vaibhav into Feature_PR vaibhav.surve 2025-11-05 09:53:33 +00:00
• b857c4d8bc feat: Enhance FinanceScreen with animation and improved UI components Vaibhav Surve 2025-11-05 15:21:00 +05:30
• 1981c90138 Merge pull request 'PR_Dev_Vaibhav' (#79) from PR_Dev_Vaibhav into Feature_PR vaibhav.surve 2025-11-05 09:49:43 +00:00
• e7a8a844d1 fix: Update navigation route in ExpenseAppBar to point to finance dashboard Vaibhav Surve 2025-11-05 15:18:46 +05:30
• 028f17dddd feat: Add FinanceScreen and update routes for finance dashboard Vaibhav Surve 2025-11-05 12:33:15 +05:30
• 80d7ef96cb feat: Add daily progress planning skeleton loader and improve UI formatting Vaibhav Surve 2025-11-04 17:41:29 +05:30
• 9cf0016ccc change color of 'create tenant & continue' button feature/payment Manish 2025-11-04 17:19:03 +05:30
• 99166801da feat: Implement lazy loading for building infrastructure and enhance task fetching logic Vaibhav Surve 2025-11-04 17:07:54 +05:30
• 3008a6ab79 UI updated of Subscription module Manish 2025-11-04 16:37:56 +05:30
• 87520d7664 fix: Adjust spacing and add today's planned tasks display in daily task planning Vaibhav Surve 2025-11-04 16:26:33 +05:30
• 41ab77d136 refactor: Enhance employee sorting by action priority and latest entry time OnFieldWork Vaibhav Surve 2025-11-04 15:47:15 +05:30
• e8d4931016 fix: Enhance employee sorting by adding latest entry comparison after action priority Vaibhav Surve 2025-11-04 15:45:53 +05:30
• f0d42edcc1 fix: Update regularization time picker to use reference time and allow past times for regularization Vaibhav Surve 2025-11-04 15:18:42 +05:30
• 47da83813d refactor: Rename getButtonColor to getprimary and update related usages Vaibhav Surve 2025-11-04 15:18:12 +05:30
• 82c2cc3c58 feat: Improve task data fetching by clearing grouped tasks on new load and preventing duplicates Vaibhav Surve 2025-11-04 14:52:17 +05:30
• 5d99f3fdfd Merge pull request 'Dashboard_Expense_Widgets_OFW' (#78) from Dashboard_Expense_Widgets_OFW into OnFieldWork vaibhav.surve 2025-11-04 08:46:32 +00:00
• 03b82764ed Refactor attendance and document controllers to use reactive date ranges, implement reusable DateRangePickerWidget, and enhance filter functionality in attendance and expense screens. Dashboard_Expense_Widgets_OFW Vaibhav Surve 2025-11-04 14:15:45 +05:30
• ac7a75c92f Refactor date handling in controllers and UI components Vaibhav Surve 2025-11-04 14:15:21 +05:30
• b1437db9e0 fix: Update text label in attendance filter bottom sheet for clarity Vaibhav Surve 2025-11-03 17:46:33 +05:30
• b33b3da6c0 refactor: Rename ProjectProgressChart to AttendanceDashboardChart and update data handling for attendance overview Vaibhav Surve 2025-11-03 17:40:18 +05:30
• 4d3a42e851 feat: Update image picker section to use dynamic primary color for icons and buttons Vaibhav Surve 2025-11-03 17:07:15 +05:30
• 817672c8b2 refactor: Improve Attendance and Project Progress Charts with enhanced styling and tooltip formatting Vaibhav Surve 2025-11-03 16:51:51 +05:30
• c78c14e409 refactor: Clean up attendance controller initialization and enhance project change handling Vaibhav Surve 2025-11-03 16:43:51 +05:30
• 4f0261bf0b feat: Add Monthly Expense Dashboard Chart and related data models Vaibhav Surve 2025-11-03 16:43:29 +05:30
• ebc8996f71 feat: Enhance monthly expense dashboard with expense type filtering functionality Vaibhav Surve 2025-11-03 15:00:59 +05:30
• 3c95583a23 feat: Add monthly expense reporting functionality with dashboard integration Vaibhav Surve 2025-11-03 14:24:39 +05:30
• e674d18542 current plan screen implmentation Manish 2025-11-03 12:11:34 +05:30
• 91174dd960 fix: Adjust padding and inner radius for expense donut chart based on mobile layout Vaibhav Surve 2025-11-03 10:25:58 +05:30
• 9e52e50cc9 fix: Change ProjectController injection method from Get.find to Get.put for proper dependency management Vaibhav Surve 2025-11-03 10:14:49 +05:30
• 177f8c32e2 feat: Add Expense By Status Widget and related models Vaibhav Surve 2025-11-01 17:29:16 +05:30
• b4be463da6 refactor: Adjust inner radius of ExpenseDonutChart for improved visual clarity Vaibhav Surve 2025-11-01 17:14:44 +05:30
• 3ad3515d8d fixed routing Manish 2025-11-01 16:52:14 +05:30
• 32d74d23dd added import get package Manish 2025-11-01 16:37:55 +05:30
• 79c34a62d7 revert 7e64e8c091ff4eee842f023d312c3687ac288fd7 manish.zure 2025-11-01 10:59:47 +00:00
• b0b68d688e revert 4aaf8a6bf1db345351c44b5136e4ca9f67da1834 manish.zure 2025-11-01 10:58:30 +00:00
• 4aaf8a6bf1 Merge branch 'feature/payment' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into feature/payment Manish 2025-11-01 16:17:45 +05:30
• 21adc5e556 change create tenant ui and added indudtry dropdown Manish 2025-11-01 15:14:00 +05:30
• 7e427237c3 implement create tender screen Manish 2025-10-31 16:57:38 +05:30
• 12fbef19c5 changes in payment screen UI Manish 2025-10-31 10:57:50 +05:30
• c556df1f80 implemented razorpay payment successfully Manish 2025-10-30 17:23:00 +05:30
• 70fcc2e662 subscription Manish 2025-10-30 16:02:14 +05:30
• 2d95e92edb implementation of subscription module Manish Zure 2025-10-29 14:03:41 +05:30
• 8415b6549d implementation of payment feature Manish Zure 2025-10-27 16:45:23 +05:30
• 6c0f325a44 implementation of payment feature Manish Zure 2025-10-27 15:40:44 +05:30
• ff9c712a7e implementation of payment feature Manish Zure 2025-10-27 11:55:40 +05:30
• 7e64e8c091 change theme ui Manish Zure 2025-10-24 16:54:13 +05:30
• 99f6c594b9 feat: Enhance tooltip behavior in ExpenseDonutChart to display formatted currency and percentage Vaibhav Surve 2025-11-01 15:52:59 +05:30
• 9890fbaffe refactor: Update ExpenseDonutChart data labels to display formatted currency instead of percentage Vaibhav Surve 2025-11-01 15:41:05 +05:30
• 4a5fd1c7cc feat: Update Dashboard with Expense Type Report Chart and enhance loading experience with skeleton loaders Vaibhav Surve 2025-11-01 15:38:58 +05:30
• c5ebf17dbc change create tenant ui and added indudtry dropdown Manish 2025-11-01 15:14:00 +05:30
• 68cac95908 chore: Update version number to 1.0.0+12 in pubspec.yaml Vaibhav Surve 2025-11-01 11:34:50 +05:30
• 2f283765c1 refactor: Update FAQ and Support screens to use contentTheme for colors and improve UI consistency Vaibhav Surve 2025-10-31 17:20:44 +05:30
• d62f0d2c60 feat: Enhance ExpenseByStatusWidget with navigation and filter functionality; update ExpenseMainScreen to fetch expenses after UI initialization Vaibhav Surve 2025-10-31 17:13:43 +05:30
• 9dfdac0323 implement create tender screen Manish 2025-10-31 16:57:38 +05:30
• 1e39210a29 feat: Implement expense by status skeleton loader for improved loading experience Vaibhav Surve 2025-10-31 16:05:43 +05:30