Commit Graph
144 Commits
Author SHA1 Message Date
hufangzhou 11e5dc2f5a * [bug#56258,done,0.3h] Check privilege. 2024-10-18 10:16:16 +08:00
xieqiyu 4c7a643189 * [task#122858,done,0.5h] Modify the unit file of the module of holiday. 2024-07-09 10:11:09 +08:00
tianshujie 3249c8f51c * [ci,0.5h] fix unit test. 2024-06-24 08:44:04 +08:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
sunhao 526830c37c * holiday: refactor. 2024-04-26 16:21:33 +08:00
sunhao 4f5383afae * holiday: optimize style for importing holidays. 2024-04-26 16:15:36 +08:00
liyang 354c300c86 * Modify unit test directory structure and data generation method. 2024-04-22 14:25:50 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
tianshujie dff511bce8 * Change the result of the holiday::updateprojectrealduration unit test. 2024-04-12 15:08:54 +08:00
tianshujie 3ffec062b8 * Change the result of the holiday::updateprogramplanduration unit test. 2024-04-12 15:08:54 +08:00
tianshujie 83e56270bb * Change the date of the holiday::isholiday unit test. 2024-04-12 15:00:03 +08:00
tianshujie 7672e0414e * Fix the wwwRoot path of the holiday::getholidaybyapi unit test. 2024-03-05 10:22:38 +08:00
tianshujie 45eb51168e * Change the result of the holiday::updateprogramplanduration unit test. 2024-03-05 10:22:38 +08:00
tianshujie d13fb1b568 * Change the result of holiday::updateprojectrealduration unit test. 2024-03-05 10:22:38 +08:00
tianshujie 5c8c3a4441 * Change the data of the holiday::getlist unit test. 2024-03-05 10:22:38 +08:00
tianshujie 507bf8de81 * Fix path of the default.json. 2024-03-05 10:22:38 +08:00
wangyuting f379d371a7 * Add confirm icon to delete modal. bug #45154. 2024-02-21 14:02:32 +08:00
liumengyi c0c946a4ba * Fix bug #44983, modify style of title. 2024-01-30 16:53:53 +08:00
leiyong 4ebe2ce612 * Adjust the way to obtain holidays. 2024-01-30 07:18:50 +00:00
daitingting 8c7fa8de0e * Fix bug #44815. 2024-01-24 06:15:31 +00:00
leiyong 4e97ad9f38 * Fix bug #43154. 2024-01-22 08:07:05 +00:00
tianshujie 1f935f96bf * Change the zt_task and zt_holiday data of the holiday updateTaskRealDuration unit test. 2024-01-05 14:47:57 +08:00
tianshujie 32085c1621 * Modify the step description of the holiday::getWorkingDays unit test. 2024-01-05 14:44:38 +08:00
tianshujie d2a616bccc * Change the zt_task and zt_holiday data of the holiday::updateTaskPlanDuration unit test. 2024-01-05 14:38:00 +08:00
tianshujie 22054d8b2e * Change the zt_project and zt_holiday data of the holiday::updateProjectRealDuration unit test. 2024-01-05 14:34:16 +08:00
tianshujie fa74d31582 * Change data of zt_project and zt_holiday of the holiday::updateProgramPlanDuration unit test. 2024-01-05 14:28:27 +08:00
tianshujie 5d9f21a31c * Change holiday of the holiday::getWorkingDays unit test. 2024-01-05 14:16:05 +08:00
tianshujie 0b960729e0 * Change result of the holiday::getHolidays unit test. 2024-01-05 13:42:34 +08:00
tianshujie 2df9a4a097 * Change id data of zt_holiday. 2024-01-05 13:38:51 +08:00
tianshujie 6d4f03915c * Change the zt_holiday data. 2024-01-05 13:36:25 +08:00
朱金勇 babc355f04 * Fix getHolidayByAPI() of holiday. 2024-01-05 08:53:14 +08:00
xieqiyu dbd15b839c * Delete the test file of getHolidayByApi. 2024-01-02 11:29:21 +08:00
xieqiyu a595bd7cd7 * Modify the test files of the module of holiday. 2024-01-02 10:43:37 +08:00
xieqiyu 896167e4d3 * Modify the test file of batchCreate. 2024-01-02 10:14:07 +08:00
xieqiyu 41dfabd792 * Modify the test file of getHolidays. 2024-01-02 10:10:37 +08:00
xieqiyu b359659e41 * Modify the test file of getHolidayByAPI. 2024-01-02 10:01:07 +08:00
xieqiyu f4431ce248 * Modify the test file of getActualWorkingDays. 2024-01-02 09:47:36 +08:00
caoyanyi 6f7c3e4f55 * Update copyright info. 2023-12-06 14:17:46 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
liumengyi 59c2898c8f * Refactor holidayModel::batchCreate, and modify its unit test. 2023-12-05 09:19:43 +08:00
liumengyi d7d818cccf * Refactor holidayModel::getHolidayByAPI, and add its unit test. 2023-12-05 09:10:05 +08:00
liumengyi c0a2a0bf81 * Modify unit test data, and modify releated unit test. 2023-12-05 09:01:19 +08:00
liumengyi 8dd9bd5e98 * Modify holidayModel::updateTaskRealDuration, and modify its unit test. 2023-12-05 08:48:40 +08:00
liumengyi f76fc5fe81 * Refactor holidayModel::updateTaskPlanDuration, and modify its unit test. 2023-12-05 08:38:07 +08:00
liumengyi 18363ee679 * Add function comment. 2023-12-04 15:53:25 +08:00
liumengyi f39f898c37 * Refactor holidayModel::updateProjectRealDuration, and modify its unit test. 2023-12-04 15:46:56 +08:00
liumengyi d6537f77bf * Refactor holidayModel::updateProgramPlanDuration, and modify its unit test. 2023-12-04 15:31:54 +08:00
liumengyi 046c336bcc * Modify unit test to get the actual working day on the same date. 2023-12-04 14:25:29 +08:00
liumengyi c3c7774d02 * Refactor holidayModel::isWorkingDay, and modify its unit test. 2023-12-04 14:01:20 +08:00