Commit Graph

354 Commits

Author SHA1 Message Date
AmirHossein Mahmoodi
82cf9ac49b Merge branch 'feature/date_picker_TF-93' into 'develop'
TF-93 Implementation of Date picker filter for tables to component

See merge request witel3/loan-facilities-expert!77
2023-08-27 10:37:34 +00:00
4ba97d9719 mui_date_picker_TF-93 2023-08-27 14:04:22 +03:30
AmirHossein Mahmoodi
e64f3bbf34 Merge branch 'bugfix/edit_button_TF-93' into 'develop'
TF-93 All "Niyaz Be Viraish" button styles and text need to be edited in the Expert panel

See merge request witel3/loan-facilities-expert!76
2023-08-27 07:39:46 +00:00
9c0920efaf edit_button_bugfix 2023-08-27 11:01:50 +03:30
AmirHossein Mahmoodi
ca6ad96d9e Merge branch 'develop' into 'main'
cleaning datatable component and make it more flexible/ debug notification and...

See merge request witel3/loan-facilities-expert!75
2023-08-23 07:46:37 +00:00
Amirhossein Mahmoodi
0a7165c646 add GlobalHead.jsx and NetworkComponent.jsx
and useNetwork.jsx and fixed bugs
2023-08-23 11:12:18 +03:30
AmirHossein Mahmoodi
4fae2f4da3 Merge branch 'feature/sidebar_notification' into 'develop'
Feature/sidebar notification

See merge request witel3/loan-facilities-expert!74
2023-08-22 08:33:33 +00:00
74b3e69415 sideBar notification 2023-08-22 11:55:51 +03:30
Amirhossein Mahmoodi
81a058edbe update package.json 2023-08-21 11:10:44 +03:30
Amirhossein Mahmoodi
853c643854 remove useless variable 2023-08-21 10:25:44 +03:30
674613e765 useNotification init 2023-08-14 13:44:43 +03:30
AmirHossein Mahmoodi
c60a85ca03 Merge branch 'feature/debug_navgan_cartable' into 'develop'
Feature/debug navgan cartable

See merge request witel3/loan-facilities-expert!73
2023-08-13 12:13:21 +00:00
c91e53bc20 delete commits 2023-08-13 15:41:05 +03:30
2d70f0a088 debug refahi province manager 2023-08-13 15:27:39 +03:30
004feca2aa debug inspector expert and development assistant 2023-08-13 14:58:56 +03:30
e015ac36b6 debug province head expert 2023-08-13 14:16:23 +03:30
AmirHossein Mahmoodi
f6415288eb Merge branch 'feature/refahi_province_manager' into 'develop'
refahi province manager init

See merge request witel3/loan-facilities-expert!68
2023-08-12 13:11:22 +00:00
Amirhossein Mahmoodi
dbe8ab700c Merge branch 'develop' into 'feature/refahi_province_manager'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
2023-08-12 16:40:36 +03:30
Amirhossein Mahmoodi
11dedbb616 Merge branch 'develop' into 'feature/refahi_province_manager'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
2023-08-12 16:27:25 +03:30
AmirHossein Mahmoodi
83747201d7 Merge branch 'feature/development_assistant' into 'develop'
development assistant init

See merge request witel3/loan-facilities-expert!69
2023-08-12 12:47:35 +00:00
Amirhossein Mahmoodi
b7363f2e92 Merge branch 'develop' into 'feature/development_assistant'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx
2023-08-12 16:16:41 +03:30
Amirhossein Mahmoodi
7af22bab33 Merge branch 'develop' into 'feature/development_assistant'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx
2023-08-12 16:13:43 +03:30
AmirHossein Mahmoodi
2ef9ae0e30 Merge branch 'feature/inspector_expert' into 'develop'
ispector expert init

See merge request witel3/loan-facilities-expert!70
2023-08-12 12:22:23 +00:00
AmirHossein Mahmoodi
943a009fc9 Merge branch 'develop' into 'feature/inspector_expert'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx
2023-08-12 12:22:17 +00:00
AmirHossein Mahmoodi
0e898c9677 Merge branch 'feature/commercial_chief' into 'develop'
commercial chief init

See merge request witel3/loan-facilities-expert!71
2023-08-12 11:17:11 +00:00
AmirHossein Mahmoodi
53f6285edc Merge branch 'develop' into 'feature/commercial_chief'
# Conflicts:
#   src/core/data/apiRoutes.js
2023-08-12 11:17:04 +00:00
AmirHossein Mahmoodi
fcfb15daeb Merge branch 'feature/province_head_expert' into 'develop'
province head expert init

See merge request witel3/loan-facilities-expert!72
2023-08-12 11:15:47 +00:00
c7270290df refahi province manager init 2023-08-12 14:23:30 +03:30
5e85ae2119 development assistant init 2023-08-12 13:37:14 +03:30
d9d8695fbf ispector expert init 2023-08-12 13:17:39 +03:30
31697ec1bd commercial chief init 2023-08-12 11:34:38 +03:30
df58f782ce province head expert init 2023-08-12 10:42:20 +03:30
AmirHossein Mahmoodi
a48c751275 Merge branch 'feature/fixedApiAndCommercialCheifPage' into 'develop'
Feature/fixed api and commercial cheif page

See merge request witel3/loan-facilities-expert!67
2023-08-12 06:02:02 +00:00
Amirhossein Mahmoodi
3c3d44ce78 fixed bug 2023-08-09 16:55:40 +03:30
Amirhossein Mahmoodi
fee4fa8261 add attachment to confirm and reject forms 2023-08-09 15:48:26 +03:30
Amirhossein Mahmoodi
64e717990f used useRequest 2023-08-09 15:05:29 +03:30
Amirhossein Mahmoodi
65753c52ca fixed bug auth in useRequest 2023-08-09 14:23:00 +03:30
Amirhossein Mahmoodi
c23672c86c add auth to useRequest 2023-08-09 14:05:08 +03:30
Amirhossein Mahmoodi
ce3cc53378 Rename the files with the appropriate structure 2023-08-09 13:53:31 +03:30
Amirhossein Mahmoodi
d33c4b252e Rename the files with the appropriate structure 2023-08-09 13:52:57 +03:30
AmirHossein Mahmoodi
2896f7dae5 Merge branch 'feature/debug_forms' into 'develop'
Feature/debug forms

See merge request witel3/loan-facilities-expert!66
2023-08-09 10:06:03 +00:00
AmirHossein Mahmoodi
400a52dfe1 Merge branch 'develop' into 'feature/debug_forms'
# Conflicts:
#   src/components/dashboard/machinary-office/TableRowActions.jsx
#   src/components/dashboard/passenger-boss/TableRowActions.jsx
#   src/components/dashboard/passenger-office/TableRowActions.jsx
#   src/components/dashboard/province-manager/TableRowActions.jsx
#   src/components/dashboard/transportation-assistance/TableRowActions.jsx
2023-08-09 10:05:10 +00:00
Amirhossein Mahmoodi
3726d2ec38 implementation errorHandler 2023-08-09 12:38:08 +03:30
cea6f4c3dc show error in numeric field 2023-08-09 11:42:05 +03:30
ac33d3f861 debug confirm and reject fom 2023-08-08 15:21:35 +03:30
d7196c7b8d Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_forms 2023-08-08 09:43:55 +03:30
Amirhossein Mahmoodi
842f1029c1 fixed theme 2023-08-07 17:00:23 +03:30
9769e28e59 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into develop 2023-08-07 16:04:43 +03:30
Amirhossein Mahmoodi
f6904b0334 Disable Automatic Revalidations Datatable 2023-08-07 14:26:14 +03:30
f006058539 pulled changes 2023-08-07 14:25:05 +03:30