Commit Graph
53 Commits
Author SHA1 Message Date
tianshujie 507bf8de81 * Fix path of the default.json. 2024-03-05 10:22:38 +08:00
leiyong 4ebe2ce612 * Adjust the way to obtain holidays. 2024-01-30 07:18:50 +00:00
leiyong 4e97ad9f38 * Fix bug #43154. 2024-01-22 08:07:05 +00:00
朱金勇 babc355f04 * Fix getHolidayByAPI() of holiday. 2024-01-05 08:53:14 +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 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 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 c3c7774d02 * Refactor holidayModel::isWorkingDay, and modify its unit test. 2023-12-04 14:01:20 +08:00
liumengyi 18053077c6 * Refactor holidayModel::isHoliday, and modify its unit test. 2023-12-04 13:51:39 +08:00
liumengyi 5e5acfe201 * Refactor holidayModel::getDaysBetween, and modify its unit test. 2023-12-04 13:45:33 +08:00
liumengyi ed6dea8db8 * Refactor holidayModel::getActualWorkingDays, and modify its unit test. 2023-12-04 13:41:13 +08:00
liumengyi 9fb9f23b27 * Optimize code for holidayModel::getHolidays, and modify its unit test. 2023-12-04 13:18:02 +08:00
liumengyi c1b3e30c6b * Refactor holidayModel::getHolidays, and modify its unit test. 2023-12-04 10:54:17 +08:00
liumengyi 31962ba29b * Refactor holidayModel::getHolidays, and modify its unit test. 2023-12-04 10:14:50 +08:00
liumengyi 9b823cc345 * Refactor holidayModel::update, and modify its unit test. 2023-12-04 09:29:50 +08:00
liumengyi 014e79fff7 * Refactor holidayModel::create, and modify its unit test. 2023-12-04 09:19:47 +08:00
liumengyi fdb02113a1 * Refactor holidayModel::getYearPairs, and modify its unit test. 2023-12-04 09:12:04 +08:00
liumengyi 79ff1c28d2 * Refactor holidayModel::getList, and modify its unit test. 2023-12-04 09:09:31 +08:00
liumengyi 7713ebc27d * Refactor holidayModel::getByID, and modify its unit test. 2023-12-04 09:00:04 +08:00
liumengyi 3db598fcf7 * Refactor holiday::edit. 2023-12-02 15:55:38 +08:00
liumengyi 0c9a138291 * Refactor holiday::create. 2023-12-02 15:48:28 +08:00
sunguangming ae0b1a7804 * Move holiday's ext model into model.php. 2023-07-13 13:49:39 +08:00
liumengyi cc8ad3f3c9 * Refactor holiday::create. 2023-06-21 16:36:00 +08:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
Lufei 79540ab480 * Use string instead of varchar. 2022-12-08 14:23:23 +08:00
tianshujie e31283d2f9 * Modified Obtain the configuration information about the workweek. 2022-11-17 15:47:12 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 192198a02f Merge branch 'test_sunjun' into 'master'
test_sunjun

See merge request easycorp/zentaopms!3262
2022-05-07 02:03:09 +00:00
sunjun 3ceae4320f test_sunjun 2022-05-07 01:41:38 +00:00
zhouxin d1ebd38016 * Add tsetcase for holiday. 2022-05-06 09:19:37 +00:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
孙广明 612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
Yagami 67832082d6 * Move holiday to max. 2021-02-24 16:29:02 +08:00
leiyong 4458e57c9d * Adjust code. 2020-12-21 10:39:49 +08:00
leiyong bff36567c9 * Adjust code. 2020-12-18 13:35:10 +08:00
leiyong bb485680aa * Adjust the budget module code. 2020-12-09 08:27:19 +08:00
hufangzhou 8b291bc6da * Fix bug#3736. 2020-12-08 11:34:35 +08:00
leiyong d2ddce5e7c * Adjust the holiday module. 2020-12-08 11:08:32 +08:00
leiyong c1322442fd * Adjust the holiday module. 2020-11-11 18:21:47 +08:00