ManagementSystem

Commit Graph

Select branches

Hide Pull Requests

Sprint-3/MS-23

Sprint-3/MS-24

Sprint-3/MS-26

Sprint-3/MS-28

Sprint-4/MS-35-BE-Technical

Sprint-4/MS-36-FE-Technical

Sprint-4/MS-37-FE-Evaluation

Sprint-4/MS-38-BE-Evaluation

Truong-CreateAutoTicketKPhep

dev

joseph.Update_personnel_allocation

joseph.update_navbar_permissions

master

that-bill

that-fe

truong-fix-create-ticket

truong-frame-drawio

truong-leave-day

truong-report-excel

truong-sprint-1

vi

vi.document

vi.ticket-email

zelda.checkin-for-au

zelda.create-tracking-tool-web

zelda.fix-ui-responsive-client

zelda.push-tracking-tool-web

zelda.refactor-tracking-tool-web

zelda.update-checkin-api

zelda.update-static-file-tracking-tool-web

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#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

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

a823b6812f Merge pull request 'Sprint-3/MS-28' (#24) from Sprint-3/MS-28 into master Sprint-3/MS-28 joseph 2024-09-16 10:45:23 +1000
69806fda4b Tạo trang Profile Truong Vo 2024-09-16 00:52:53 +0700
1b84528dec Tạo trang Profile (chưa merge master) Truong Vo 2024-09-13 18:17:19 +0700
cfe9ee5da9 Merge pull request 'Sprint-3/MS-26' (#23) from Sprint-3/MS-26 into master joseph 2024-09-13 13:26:35 +1000
c848004a8d Merge pull request 'Sprint-3/MS-24' (#22) from Sprint-3/MS-24 into master joseph 2024-09-13 13:26:24 +1000
17a273ac61 Tạo trang Test report Sprint-3/MS-26 Truong Vo 2024-09-13 10:24:40 +0700
fb32244185 Tạo trang Test report Truong Vo 2024-09-13 10:17:16 +0700
669c6c1ef3 Thực hiện tạo page Sprint Review Sprint-3/MS-24 Truong Vo 2024-09-13 01:40:31 +0700
e4745f1636 Thực hiện tạo page Sprint Review Truong Vo 2024-09-13 01:39:45 +0700
16af707711 create migrate file truong-sprint-1 JOSEPH LE 2024-09-12 08:49:31 +0700
dcd15ef578 update logo login JOSEPH LE 2024-09-09 08:10:59 +0700
482f1bbe60 asd JOSEPH LE 2024-09-07 09:19:10 +0700
cc16dd6020 update qrcode JOSEPH LE 2024-09-07 09:06:02 +0700
bb3c9b2106 create function user manament JOSEPH LE 2024-09-06 16:28:59 +0700
8f6092be62 update user list JOSEPH LE 2024-08-23 08:19:50 +0700
c43bb69a87 update view permission JOSEPH LE 2024-08-16 14:53:20 +0700
f37f4f2d06 update view permission JOSEPH LE 2024-08-16 14:45:09 +0700
af21e8513b update view permission JOSEPH LE 2024-08-16 14:33:09 +0700
29ebdcefcc update view permission JOSEPH LE 2024-08-16 14:29:17 +0700
98976d1e1d update view permission JOSEPH LE 2024-08-16 14:23:31 +0700
efe33eb21e update view permission JOSEPH LE 2024-08-16 14:14:25 +0700
658b9bf0a2 Merge pull request 'Hiệu chỉnh template gửi email' (#21) from truong-sprint-1 into master vincent.vo 2024-08-15 18:28:10 +1000
5245b34a20 Hiệu chỉnh template gửi email Truong Vo 2024-08-15 15:27:56 +0700
0ab7b88fda Merge pull request 'Hiệu chỉnh template gửi email' (#20) from truong-sprint-1 into master vincent.vo 2024-08-15 18:13:46 +1000
163e073f24 Hiệu chỉnh template gửi email Truong Vo 2024-08-15 15:13:34 +0700
ab5cea735a Merge pull request 'Hiệu chỉnh template gửi email' (#19) from truong-sprint-1 into master vincent.vo 2024-08-15 18:11:02 +1000
3e2d9c2af4 Hiệu chỉnh template gửi email Truong Vo 2024-08-15 15:10:46 +0700
c7ebc62d0a Merge pull request 'truong-sprint-1' (#18) from truong-sprint-1 into master vincent.vo 2024-08-15 18:00:23 +1000
f909c78a62 Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-15 15:00:05 +0700
9ae6a72ae4 Hiệu chỉnh template gửi email Truong Vo 2024-08-15 15:00:00 +0700
4b9318b107 Bổ sung cột update by cho trang ticket and ticket management Truong Vo 2024-08-15 10:12:18 +0700
9b966a53cd Merge pull request 'truong-sprint-1' (#17) from truong-sprint-1 into master vincent.vo 2024-08-15 12:24:44 +1000
ebe031afac fix check quyền user admin ở page ticket and tracking Truong Vo 2024-08-15 09:24:22 +0700
b9ecfa5da2 Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-15 08:56:00 +0700
b4b73716c9 Merge pull request 'cập nhật kiểm tra quyền để hiển menu' (#16) from truong-sprint-1 into master vincent.vo 2024-08-15 11:51:58 +1000
4c3ca95bb5 cập nhật kiểm tra quyền để hiển menu Truong Vo 2024-08-15 08:51:40 +0700
78048634c2 Merge pull request 'truong-sprint-1' (#15) from truong-sprint-1 into master vincent.vo 2024-08-14 17:38:43 +1000
6a5c0e9097 fix width cột chức năng quản lý ngày phép Truong Vo 2024-08-14 14:38:12 +0700
930efa1f8c Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-14 11:18:18 +0700
13148a1be1 Merge pull request 'truong-sprint-1' (#14) from truong-sprint-1 into master vincent.vo 2024-08-14 14:18:10 +1000
745b34b1e3 Hiệu chỉnh view thời gian của trang tickets, tickets managements Truong Vo 2024-08-14 11:12:28 +0700
2a419dc9ec Hiệu chỉnh job tính ngày phép dư năm rồi Truong Vo 2024-08-14 10:05:26 +0700
377cb2d079 Hiệu chỉnh job tính ngày phép dư năm rồi Truong Vo 2024-08-14 10:04:08 +0700
93aa85be8c QUản lý danh sách ngày nghỉ: Cập nhật view tooltip all off Truong Vo 2024-08-14 09:43:06 +0700
3b7704c473 Merge pull request 'Bổ sung tooltip ngày nghỉ , tổng ngày nghỉ, custom màu cho cột total, off, remaining' (#13) from truong-sprint-1 into master vincent.vo 2024-08-13 19:33:00 +1000
5e0c48e3b9 Bổ sung tooltip ngày nghỉ , tổng ngày nghỉ, custom màu cho cột total, off, remaining Truong Vo 2024-08-13 16:31:22 +0700
0129d0fe42 Merge pull request 'truong-sprint-1' (#12) from truong-sprint-1 into master joseph 2024-08-13 12:18:37 +1000
f87db7cda5 Hiệu chỉnh padding template gửi email Truong Vo 2024-08-13 09:12:35 +0700
35969295cc Hiệu chỉnh padding template gửi email Truong Vo 2024-08-13 09:01:25 +0700
45747931f2 Merge pull request 'fix bug' (#11) from truong-sprint-1 into master joseph 2024-08-12 13:35:35 +1000
0ca6b837e9 fix bug Truong Vo 2024-08-12 10:34:22 +0700
4e41e7cbcb Merge pull request 'truong-sprint-1' (#10) from truong-sprint-1 into master joseph 2024-08-12 12:58:09 +1000
d53a60382d Gửi email thông báo cho admin khi tạo đơn, trả email thông báo đơn được … Truong Vo 2024-08-12 09:39:51 +0700
c4803c5c96 Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-12 09:33:59 +0700
2fb2d44d6c Gửi email thông báo cho admin khi tạo đơn, trả email thông báo đơn được duyệt hoặc từ chối cho user Truong Vo 2024-08-12 09:33:51 +0700
72b586e94a clean code fe page Timekeeping Truong Vo 2024-08-09 15:36:33 +0700
072d8ccad7 Bổ sung check lỗi không có quyền khi xóa nôte Truong Vo 2024-08-09 15:16:07 +0700
4f492df167 Merge pull request 'truong-sprint-1' (#9) from truong-sprint-1 into master joseph 2024-08-09 17:59:18 +1000
4744ac3e23 Bổ sung check nếu là WFH thì check in cho user Truong Vo 2024-08-09 14:48:28 +0700
688c521986 Bổ sung check nếu là WFH thì check in cho user Truong Vo 2024-08-09 14:46:35 +0700
8b5eadfbcf fix Truong Vo 2024-08-09 14:14:09 +0700
12d362edc2 fix Truong Vo 2024-08-09 14:13:30 +0700
1057eec8c0 fix Truong Vo 2024-08-09 14:13:06 +0700
5703804e5c Bổ sugn check admin navbar + view thông tin ticket management + delete note timekeeping Truong Vo 2024-08-09 14:02:34 +0700
9b8945aa21 Hiệu chỉnh thanh navar + view thêm thông tin ticket khi duyệt, từ chối Truong Vo 2024-08-09 09:32:52 +0700
571ebb6a09 Merge pull request 'truong-sprint-1' (#8) from truong-sprint-1 into master joseph 2024-08-09 10:30:24 +1000
3c182ac914 Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-08 17:12:54 +0700
971f6718e6 Build page Ticket management Truong Vo 2024-08-08 17:12:48 +0700
64d3bc72f0 Build page Ticket management Truong Vo 2024-08-08 17:09:12 +0700
4fd24d2407 Bổ sung kiểm tra quyền chỉ admin mới vào được page ticket management Truong Vo 2024-08-08 14:17:31 +0700
830b2748d2 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem JOSEPH LE 2024-08-08 13:36:34 +0700
74a20a714b update migration JOSEPH LE 2024-08-08 13:36:30 +0700
34a40282c3 Merge pull request 'Tạo page ticket management' (#7) from truong-sprint-1 into master joseph 2024-08-08 13:37:32 +1000
10c397e184 Tạo page ticket management Truong Vo 2024-08-08 10:37:04 +0700
d53491830e Tạo page ticket management Truong Vo 2024-08-08 10:28:20 +0700
348d09e1b8 Merge pull request 'truong-sprint-1' (#6) from truong-sprint-1 into master joseph 2024-08-08 13:18:21 +1000
f8c1459be9 Tạo page ticket management Truong Vo 2024-08-08 10:13:39 +0700
1bc36e6eec Tạo page ticket management Truong Vo 2024-08-08 10:07:33 +0700
afca1c0f6c Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-08 10:04:05 +0700
b8d9f9f66c Build page tickets Truong Vo 2024-08-08 10:03:33 +0700
fdb0c769e6 create API update cache JOSEPH LE 2024-08-08 09:44:57 +0700
ed32b03e5b update API handle ticket JOSEPH LE 2024-08-07 15:16:59 +0700
aec80f2e94 update Ui JOSEPH LE 2024-08-07 13:37:35 +0700
a0a740cca3 create API ticker JOSEPH LE 2024-08-07 13:22:21 +0700
cb65f1fffc update UI JOSEPH LE 2024-08-07 08:33:15 +0700
1dc7cf579c update UI JOSEPH LE 2024-08-07 08:29:34 +0700
2b98a025a6 update UI JOSEPH LE 2024-08-07 08:25:17 +0700
a673c5a293 Merge pull request 'Update TimekeepingController.php' (#5) from truong-sprint-1 into master joseph 2024-08-06 20:15:28 +1000
0b63632e1b Update TimekeepingController.php Truong Vo 2024-08-06 17:14:59 +0700
4a6bc534ff Merge pull request 'Update 2024_08_02_025714_create_categories_table.php' (#4) from truong-sprint-1 into master joseph 2024-08-06 19:48:57 +1000
5b66eaeb28 Update 2024_08_02_025714_create_categories_table.php Truong Vo 2024-08-06 16:48:18 +0700
e864f1cc5c Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagemetSystem JOSEPH LE 2024-08-06 16:22:28 +0700
445ebd3ca7 update JOSEPH LE 2024-08-06 16:22:23 +0700
1001c7f2af Merge pull request 'truong-sprint-1' (#3) from truong-sprint-1 into master joseph 2024-08-06 19:16:23 +1000
b89bb2da88 Update LeaveManagement.tsx Truong Vo 2024-08-06 16:13:45 +0700
7ed053363c Update LeaveManagement.tsx Truong Vo 2024-08-06 16:12:25 +0700
3adc832da7 Update 2024_08_02_025714_create_categories_table.php Truong Vo 2024-08-06 16:11:43 +0700
8125ab8e16 Thực hiện chức năng ngày phép Truong Vo 2024-08-06 16:10:41 +0700
26b8c724fe Merge branch 'master' into truong-sprint-1 Truong Vo 2024-08-06 16:07:29 +0700
2fdd687fc9 Thực hiện chức năng ngày phép Truong Vo 2024-08-06 16:06:29 +0700