Commit Graph
1112 Commits
Author SHA1 Message Date
sunguangming fff0795e53 Merge branch 'release/21.7.2' into main 2025-07-01 06:37:04 +00:00
wangyuting cb65f7c414 * [bug#63562,done,1h,0h] Remove project template begin and end field. 2025-06-24 13:22:23 +08:00
sunguangming 346214bc14 * [bug#63415,done,0.2h] fix bug. 2025-06-19 03:12:31 +00:00
sunguangming 0429d23554 * [bug#63412,done,0.2h] fix bug. 2025-06-19 03:07:22 +00:00
刘刚 3b5a96f834 Merge branch release/21.7.2 of zentao/zentaopms (#9625) 2025-06-18 13:30:46 +08:00
tianshujie e7145afd3c * [unittest] fix getpointenddate error. 2025-06-18 10:53:31 +08:00
xieqiyu 2155a40448 Merge branch 'feature/doctemplate' into release/21.7.2 2025-06-18 02:18:57 +00:00
daitingting a0b1b58111 * [task#143873,doing,1h] Set ganttFields and showFields in block. 2025-06-14 16:14:00 +08:00
daitingting d911b08a9e * [task#143873,doing,0.5h] Adjust gantt text in document. 2025-06-14 16:12:28 +08:00
xieqiyu 37465daeed * [unittest] Add the step for the unit test of programplanModel::saveCustomSetting. 2025-06-14 07:05:55 +00:00
刘刚 6536d6dc31 Merge branch dev/bug-63028 of zentao/zentaopms (#9428) 2025-06-11 17:23:57 +08:00
刘刚 f1b3ae6df4 Merge branch dev/bug-63163 of zentao/zentaopms (#9422) 2025-06-11 17:03:33 +08:00
wangyuting 8a62f96d46 * [bug#63028,done,0.1h,0h] Optimize code. 2025-06-11 07:26:53 +00:00
wangyuting 887bf23bc4 * [bug#63028,done,0.1h,0h] Optimize code. 2025-06-11 07:22:13 +00:00
tianshujie 0b07124823 * [unittest] fix syncparentdata error. 2025-06-11 15:21:27 +08:00
wangyuting c63e64dce4 * [bug#63028,done,2h,0h] Optimize calcdaysforstage function. 2025-06-11 07:16:10 +00:00
sunguangming 596f71a3c3 * [bug#63210,done,0.2h] fix bug. 2025-06-11 06:47:57 +00:00
sunguangming 86aa407e51 * [unittest] code for unittest. 2025-06-11 05:26:41 +00:00
wangyidong 034a8e6fc9 * [unittest] Fix programplan gettaskdatelimit tao method test. 2025-06-11 11:11:39 +08:00
wangyidong 3991edf5d1 * [unittest] Fix programplan buildganttlinks tao method test. 2025-06-11 11:11:39 +08:00
huairong bd45f43a21 + [task#144954,doing,0.1h,0.4h] Modify element xpath of create page. 2025-06-10 10:02:59 +08:00
刘刚 894b1c2fe5 Merge branch dev/task-144843 of zentao/zentaopms (#9253) 2025-06-09 10:10:37 +08:00
tianshujie ed2fd1ecc5 * [bug#63138,done,0.1h] optimize code. 2025-06-06 17:02:55 +08:00
tianshujie e0e0cd6951 * [bug#63138,done,0.5h] fix delay error. 2025-06-06 17:02:55 +08:00
wangyuting cc49a6dbc3 * [task#144843,doing,0.1h,2h] Optimize programplan buildtaskdataforgantt unit test script. 2025-06-06 08:45:42 +00:00
tianshujie 690436787c * [unittest] add comment for syncparentdata. 2025-06-06 15:27:19 +08:00
sunguangming d2fda5ecd0 * [tips] add tips in waterfall plus project. 2025-06-06 03:25:55 +00:00
wangyuting db43853887 Merge branch 'dev/task-144776' into release/21.7.2 2025-06-05 09:30:42 +00:00
刘刚 efc9b18858 Merge branch ztflow-sunguangming-release/21.7.2#sunguangming of zentao/zentaopms (#9155) 2025-06-05 17:22:10 +08:00
sunguangming b4b5443fe8 * [unittest] modify unittest. 2025-06-05 08:00:58 +00:00
wangyuting 9fe749abb8 * [task#144776,doing,0.1h,4h] Optimize programplan getdataforganttgroupbyassignedto unit test script. 2025-06-05 07:04:41 +00:00
liumengyi e1f91446f8 * [unittest] modify unittest of programplanModel::update. 2025-06-05 13:56:28 +08:00
tianshujie 43a654b9a1 * [unittest] fix getdataforganttgroupbyassignedto error. 2025-06-05 13:14:16 +08:00
tianshujie ac9d0ccada * [bug#63132,done,0.1h] add delay data for task. 2025-06-05 13:13:57 +08:00
tianshujie 2541d79da0 * [bug,done,0.3h] add delay data. 2025-06-05 13:07:23 +08:00
wangyuting 72fc1765f7 Merge branch 'release/21.7.2' into feature/projecttpl 2025-06-04 03:16:26 +00:00
sunguangming 4315b352ba * [task#14193,done,0.5h] fix bug. 2025-06-04 02:12:16 +00:00
daitingting b86703fe6f Merge branch 'release/21.7.2' into feature/doctemplate 2025-06-04 02:08:59 +00:00
liugang 9f6819c383 Merge branch 'release/21.7.1' into release/21.7.2 2025-05-29 15:55:10 +08:00
wangyuting 3273872a66 * [bug#62931,done,2h,0h] Fix create template task and project error. 2025-05-29 07:16:43 +00:00
tianshujie f6e01b542d * [task#73876,done,0.1h] fix the issue when the delay attribute is not exist. 2025-05-29 10:40:58 +08:00
wangyuting d80141e0e5 * [bug#62932,done,2h,0h] set template project autoTpl is false. 2025-05-29 02:23:18 +00:00
tianshujie cb4cc42e67 * [task#144207,done,0.1h] remove unused vars. 2025-05-29 10:10:14 +08:00
tianshujie d4409fbd4e * [task#144207,done,0.2h] Use the computeDelay method to get the delay days. 2025-05-29 10:10:14 +08:00
daitingting 3d07125426 * [task#143871,done,2h] Set gantt block when create document by template. 2025-05-28 09:13:26 +00:00
tianshujie e00adfb629 * [task#144204,done,0.5h] optimize compute delay logic for task list. 2025-05-28 10:53:18 +08:00
daitingting fde1afa600 * [task#143873,doing,2h] Insert gantt chart in document. 2025-05-27 09:04:09 +00:00
tianshujie cae4cab141 * [task#144206,done,2h] optimize task compute delay logic for the stage list. 2025-05-27 16:39:13 +08:00
wangyuting 682642c46c * Optimize code. 2025-05-27 07:43:38 +00:00
tianshujie 3dd3baacf1 * [task#143181,done,2h] optimze compute delay logic. 2025-05-27 14:54:39 +08:00