Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350

VERSION

@@ -1 +1 @@
-17.6.2
+17.7

config/config.php

@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version       = '17.6.2';             // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '17.7';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->liteVersion   = '1.2';                // 迅捷版版本。      The version of Lite.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.

db/update17.6.2.sql

@@ -71,6 +71,5 @@ ALTER TABLE `zt_project` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '384' AF
 
 REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', 'global', 'syncProduct', '{"feedback":{},"ticket":{}}');
 
-ALTER TABLE `zt_feedback` ADD `pri` tinyint unsigned NOT NULL DEFAULT 2;
-ALTER TABLE `zt_feedback` ADD `source` varchar(255) NOT NULL;
-ALTER TABLE `zt_feedback` CHANGE `pri` `pri` tinyint unsigned NOT NULL DEFAULT 2;
+ALTER TABLE `zt_feedback` ADD `pri` tinyint unsigned NOT NULL DEFAULT 2 AFTER `desc`;
+ALTER TABLE `zt_feedback` ADD `source` varchar(255) NOT NULL AFTER `notifyEmail`;

db/zentao.sql

@@ -835,9 +835,9 @@ CREATE TABLE IF NOT EXISTS `zt_kanban` (
   `displayCards` smallint(6) NOT NULL default '0',
   `showWIP` enum('0','1') NOT NULL DEFAULT '1',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
-  `colWidth` tinyint(3) NOT NULL DEFAULT '0',
-  `minColWidth` tinyint(3) NOT NULL DEFAULT '0',
-  `maxColWidth` tinyint(3) NOT NULL DEFAULT '0',
+  `colWidth` smallint(4) NOT NULL DEFAULT '264',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `object` varchar(255) NOT NULL,
   `alignment` varchar(10) NOT NULL default 'center',
   `createdBy` char(30) NOT NULL,
@@ -1196,9 +1196,9 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   `vision` varchar(10) NOT NULL DEFAULT 'rnd',
   `displayCards` smallint(6) NOT NULL default '0',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
-  `colWidth` tinyint(3) NOT NULL DEFAULT '0',
-  `minColWidth` tinyint(3) NOT NULL DEFAULT '0',
-  `maxColWidth` tinyint(3) NOT NULL DEFAULT '0',
+  `colWidth` smallint(4) NOT NULL DEFAULT '264',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `parent` (`parent`),
@@ -7093,11 +7093,13 @@ CREATE TABLE IF NOT EXISTS `zt_feedback` (
   `type` char(30) NOT NULL,
   `solution` char(30) NOT NULL,
   `desc` text NOT NULL,
+  `pri` tinyint unsigned NOT NULL DEFAULT 2,
   `status` varchar(30) NOT NULL,
   `subStatus` varchar(30) NOT NULL default '',
   `public` enum('0','1') NOT NULL DEFAULT '0',
   `notify` enum('0','1') NOT NULL DEFAULT '0',
   `notifyEmail` varchar(100) NOT NULL,
+  `source` varchar(255) NOT NULL,
   `likes` text NOT NULL,
   `result` mediumint(8) unsigned NOT NULL,
   `faq` mediumint(8) unsigned NOT NULL,

doc/CHANGELOG

@@ -1,3 +1,193 @@
+2022-10-19 17.7
+完成的需求
+开源版
+32322 Bug批量导入页面中先校验必填字段再校验重复数据
+37245 研发需求列表增加一键展开、收起功能
+37259 列表左侧模块导航样式优化
+37261 修改研发需求列表中字段的排列顺序
+37266 研发需求列表中的操作按钮增加分组显示
+37277 研发需求列表中层级关系的样式优化
+37283 删除列表中的斑马纹背景
+37513 研发需求列表替换ZUI3组件
+37810 有父子层级的列表增加一键展开、收起功能
+37811 列表中指派给字段的交互优化
+37812 列表中负责人字段的样式优化
+37813 列表中优先级颜色调整
+37814 列表中父子层级的样式优化
+37815 列表中级别颜色调整
+37816 列表检索标签选中样式优化
+37833 叶兰绿主题风格更新
+37835 列表删除斑马纹背景
+37841 研发需求列表中，操作列增加分组显示
+37842 禅道蓝主题风格更新
+37849 任务列表操作列增加分组显示
+37854 bug列表确认字段的内容颜色调整
+37857 bug列表的字段顺序调整
+37858 用例检索标签增加分组显示
+37861 用例列表操作列交换开始和结果按钮的位置
+37862 项目集列表删除“显示已关闭”的勾选按钮
+37863 项目集列表层级关系的展示
+37864 项目集列表中延期标签位置调整
+37865 项目集列表中预算字段增加超出提示
+37866 项目集列表中项目集的内容样式优化
+37868 项目集列表操作列的更多按钮调整
+37869 删除项目集列表中项目的图标
+37975 项目列表字段顺序调整
+37976 项目列表操作列更多按钮样式优化
+37977 项目列表批量编辑项目功能增加打开按钮
+37978 产品列表的批量编辑功能增加打开按钮
+37979 产品列表层级关系的样式优化
+37980 产品列表新增负责人字段
+37982 产品列表删除用户需求字段
+37983 产品列表删除bug关闭字段
+37984 产品列表下方增加统计信息
+37985 产品列表页面中，修改产品线的按钮样式优化
+37986 产品列表的字段顺序调整
+37989 计划列表操作列增加分组显示
+37990 计划列表下方增加数据的统计信息
+37992 创建多人任务时，工时填写不大于0时增加提示语
+37993 工时记录页，日期、工作内容、消耗、剩余增加必填项校验
+37994 工时记录页，日期的icon点击后也展开日期框
+37997 多人串行任务，用户打开工时填写页，默认打开我的日志页
+37998 多人串行任务中工时记录页，日志默认按照工序排列
+37999 工时记录页，日期列和工序列增加排序按钮
+38001 工时记录页样式优化
+38002 多人串行任务中，团队日志页去掉操作区域
+38006 多人串行任务开始任务的弹窗，总计消耗改名为我的总消耗
+38008 列表中名称字段样式优化
+38010 产品列表名称字段内容样式优化
+38011 团队的填写工时页面ui优化
+38167 计划列表执行字段展示信息优化
+38186 项目列表删除类型标签，鼠标悬停显示
+38227 产品列表删除产品名称前的图标
+38240 项目集列表中，鼠标悬停到项目名称时支持显示项目类型
+38241 项目和执行列表中延期标签位置调整
+38280 产品计划列表中对父子计划展开和收起的状态做记录
+38282 看板全屏时，颜色调整
+38283 执行列表中字段顺序调整
+38285 执行列表下方增加统计信息
+38286 执行列表默认显示字段删除执行代号
+38288 执行列表中预计、消耗、剩余字段表头和内容居右对齐
+38290 地盘项目列表字段顺序调整
+38291 修改地盘执行中“未结束”的检索标签为“未完成”
+38292 地盘执行列表字段顺序调整
+38293 地盘执行列表中工时/天居右显示
+38297 地盘待处理的用例列表中，调整优先级字段的位置
+38299 测试单列表中字段调整
+38300 执行列表中批量编辑增加开关
+38302 地盘待处理的测试单列表字段顺序调整
+38303 测试单列表下方增加统计信息
+38305 地盘待办列表字段顺序调整
+38306 地盘待办列表增加统计信息
+38307 发布列表中字段顺序调整
+38308 发布列表下方增加统计信息
+38311 用例列表字段顺序调整
+38313 地盘测试单列表字段顺序调整
+38315 地盘贡献中的文档列表增加最后更新者字段
+38316 瀑布项目的设计列表字段调整
+38348 项目集的可访问人员列表中字段顺序调整
+38354 执行任务列表字段顺序调整
+38355 列表中父子层级关系的样式优化
+38375 看板列宽设置的功能优化
+38385 测试套件列表下方增加统计信息
+38393 地盘中的任务列表字段顺序调整
+38395 地盘贡献的任务列表字段顺序调整
+38396 地盘待处理的研发需求列表字段调整
+38397 地盘待处理的用户需求列表字段调整
+38398 地盘待处理的bug列表的字段顺序调整
+38423 调整计划需求列表勾选后的统计内容
+38428 列表中数据延期的样式调整
+38430 项目列表下方增加统计信息
+38431 产品项目列表增加分页栏的显示
+38493 编辑任务时，团队维护的弹窗风格调整
+38533 地盘执行列表中我的任务居中显示
+38545 会议创建表单中，参会人员的下拉菜单修改为批量选择的组件
+38629 项目发布列表增加分页功能
+38736 版本列表中字段顺序调整
+38778 创建项目时，访问控制默认勾选公开
+企业版：
+37608 反馈模块增加1.5级产品导航
+38764 无产品瀑布项目设计功能去掉产品相关信息
+38644 反馈的优先级自定义
+37605 反馈创建增加来源公司和优先级字段
+37601 反馈分类支持同步单个产品的所属产品模块
+37597 反馈模块同步产品模块后，可以创建反馈自己的模块
+37478 实现工单列表的产品模块功能
+37473 在反馈视图的二级菜单里打印工单菜单
+37474 实现工单的添加功能
+37475 实现工单的编辑功能
+37476 实现工单的详情查看功能
+37477 实现工单的列表页面
+37480 实现工单的所有检索标签
+37481 实现工单的待关闭检索标签
+37482 实现工单的指派给的标签
+37483 实现工单的由我解决的检索标签
+37484 实现工单的由我创建的检索标签
+37485 在工单的列表页面打印操作菜单
+37486 在工单的详情页面打印操作按钮
+37487 实现工单的指派功能
+37488 实现工单的完成功能
+37489 实现工单的激活功能
+37490 实现工单的关闭功能
+37491 实现工单的开始操作
+37494 提交工单中影响版本的取值逻辑
+37495 实现从工单提需求的功能
+37498 实现从反馈创建工单的功能
+37554 实现反馈工单默认指派给的逻辑
+37555 实现反馈类型与工单类型的自定义
+37558 工单的优先级自定义
+37568 实现工单的权限
+37609 地盘待处理与待处理区块的反馈后增加工单数据
+37610 日志中增加工单日志
+37650 通用看板支持导入工单
+37823 实现工单的批量编辑功能
+37824 列表增加批量完成
+37825 列表增加批量激活
+37826 列表增加批量指派
+37995 实现工单列表搜索功能
+37996 实现工单的等待与处理中检索标签
+38198 实现工单的删除功能
+38199 实现工单的日志功能
+38487 实现工单相关动态的查看权限的设置
+38789 所属产品删除对工单的影响
+旗舰版：
+38673 地盘问题列表的字段顺序调整
+38676 指派给我检索标签下的问题列表中，指派给字段修改为由谁指派
+38680 地盘待处理的问题列表中删除指派给字段
+38687 地盘日志列表字段顺序调整
+38692 风险列表中字段顺序调整
+38694 风险列表中操作列按钮增加分组显示
+38695 问题列表中操作列按钮增加分组显示
+38728 QA不符合项列表的字段顺序调整
+38729 地盘QA列表中字段顺序调整
+38730 会议列表字段顺序调整
+38738 需求库中的需求列表字段顺序调整
+38739 用例库中的用例列表字段顺序调整
+38741 问题库中的问题列表字段顺序调整
+38743 风险库中的风险列表字段顺序调整
+38745 机会库中的机会列表字段顺序调整
+38746 资产库中的审批字段居左对齐
+禅道客户端：
+36365 提供修改讨论组图标功能，支持设置图标的背景颜色及填充文字。
+36366 支持上传讨论组图标，提供图标裁剪、预览功能。
+36622 提升首次登录喧喧历史消息的加载速度。
+22468 实现文件重传入口，未完成传输的文件可以一键重传。
+36879 实现搜索人员时可以显示其当前状态的功能。
+37105 实现管理员删除用户时同步从群组中移除该用户的功能。
+36928 优化会话中图片预览缩放功能。
+36931 优化启动喧喧时音视频初检频次。
+36932 优化忽略会议时会话列表中图标的干扰。
+修复的Bug
+26082 修复了初始化会议时，可能展示会议窗口或进行通知的问题。
+27458 修复了加入或转让讨论组时，未读消息数目不正确的问题。
+23066 修复安装xxb设置管理员保存后报错的问题。
+23067 修复安装xxb成功时页面报错的问题。
+27311 修复了客户端打开链接时会出错的问题。
+26801 修复消息输入框内的图片无法另存的问题。
+26805 修复了合并会话不生效的问题。
+26106 修复下载失败的图片没有重新下载的按钮的问题。
+26453 修复了回复通知类消息时，所引用的消息的发送者名称展示错误的问题。
+
 2022-09-23 17.6.2
 完成的需求
 开源版：

module/action/lang/de.php

@@ -718,6 +718,7 @@ $lang->action->label->mr           = 'Merge Request|mr|view|id=%s';
 $lang->action->label->gitlab       = 'GitLab Server|gitlab|view|id=%s';
 $lang->action->label->stage        = 'Stage|stage|browse|';
 $lang->action->label->module       = 'Module|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
+$lang->action->label->ticket       = 'Ticket|ticket|view|id=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();

module/action/lang/en.php

@@ -718,6 +718,7 @@ $lang->action->label->mr           = 'Merge Request|mr|view|id=%s';
 $lang->action->label->gitlab       = 'GitLab Server|gitlab|view|id=%s';
 $lang->action->label->stage        = 'Stage|stage|browse|';
 $lang->action->label->module       = 'Module|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
+$lang->action->label->ticket       = 'Ticket|ticket|view|id=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();

module/action/lang/fr.php

@@ -718,6 +718,7 @@ $lang->action->label->mr           = 'Merge Request|mr|view|id=%s';
 $lang->action->label->gitlab       = 'GitLab Server|gitlab|view|id=%s';
 $lang->action->label->stage        = 'Stage|stage|browse|';
 $lang->action->label->module       = 'Module|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
+$lang->action->label->ticket       = 'Ticket|ticket|view|id=%s';
 
 /* Object type. */
 $lang->action->search = new stdclass();

module/block/lang/de.php

@@ -479,6 +479,7 @@ $lang->block->issueCount    = 'Issues';
 $lang->block->storyCount    = 'Stories';
 $lang->block->meetingCount  = 'Meetings';
 $lang->block->feedbackCount = 'Feedbacks';
+$lang->block->ticketCount   = 'Tickets';
 
 $lang->block->typeList = new stdclass();
 

module/block/lang/en.php

@@ -479,6 +479,7 @@ $lang->block->issueCount    = 'Issues';
 $lang->block->storyCount    = 'Stories';
 $lang->block->meetingCount  = 'Meetings';
 $lang->block->feedbackCount = 'Feedbacks';
+$lang->block->ticketCount   = 'Tickets';
 
 $lang->block->typeList = new stdclass();
 

module/block/lang/fr.php

@@ -479,6 +479,7 @@ $lang->block->issueCount    = 'Issues';
 $lang->block->storyCount    = 'Stories';
 $lang->block->meetingCount  = 'Meetings';
 $lang->block->feedbackCount = 'Feedbacks';
+$lang->block->ticketCount   = 'Tickets';
 
 $lang->block->typeList = new stdclass();
 

module/dev/model.php

@@ -69,7 +69,7 @@ class devModel extends model
             $type     = substr($rawField->type, 0, $firstPOS > 0 ? $firstPOS : strlen($rawField->type));
             $type     = str_replace(array('big', 'small', 'medium', 'tiny'), '', $type);
             $field    = array();
-            $field['name'] = isset($this->lang->$module->{$rawField->field}) ? sprintf($this->lang->$module->{$rawField->field}, $this->lang->dev->tableList[$module]) : '';
+            $field['name'] = (isset($this->lang->$module->{$rawField->field}) and is_string($this->lang->$module->{$rawField->field})) ? sprintf($this->lang->$module->{$rawField->field}, $this->lang->dev->tableList[$module]) : '';
             if((empty($field['name']) or !is_string($field['name'])) and $aliasModule) $field['name'] = isset($this->lang->$aliasModule->{$rawField->field}) ? $this->lang->$aliasModule->{$rawField->field} : '';
             if($subLang) $field['name'] = isset($this->lang->$aliasModule->$subLang->{$rawField->field}) ? $this->lang->$aliasModule->$subLang->{$rawField->field} : $field['name'];
             if(!is_string($field['name'])) $field['name'] = '';

module/execution/model.php

@@ -109,6 +109,13 @@ class executionModel extends model
             unset($this->lang->execution->menu->build);
         }
 
+        $stageFilter = array('request', 'design', 'review');
+        if($this->config->edition == 'open' and in_array($execution->attribute, $stageFilter))
+        {
+            unset($this->lang->execution->menu->qa);
+            unset($this->lang->execution->menu->build);
+        }
+
         if($executions and (!isset($executions[$executionID]) or !$this->checkPriv($executionID))) $this->accessDenied();
 
         $moduleName = $this->app->getModuleName();
@@ -4632,14 +4639,14 @@ class executionModel extends model
                 }
             }
         }
-        echo '<td>' . zget($users, $execution->PM) . '</td>';
         echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
-        echo '<td>' . html::ring($execution->hours->progress) . '</td>';
+        echo '<td>' . zget($users, $execution->PM) . '</td>';
         echo helper::isZeroDate($execution->begin) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->begin . '</td>';
         echo helper::isZeroDate($execution->end) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->end . '</td>';
         echo "<td class='hours text-right' title='{$execution->hours->totalEstimate}{$this->lang->execution->workHour}'>" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . '</td>';
         echo "<td class='hours text-right' title='{$execution->hours->totalConsumed}{$this->lang->execution->workHour}'>" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . '</td>';
         echo "<td class='hours text-right' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
+        echo '<td>' . html::ring($execution->hours->progress) . '</td>';
         echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
         echo '<td class="c-actions">';
         common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);

module/kanban/control.php

@@ -1401,14 +1401,14 @@ class kanban extends control
             return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
         }
 
-        $this->loadModel('product');
+        $this->loadModel('feedback');
         $this->loadModel('ticket');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $this->view->products          = array($this->lang->kanban->allProducts) + $this->product->getPairs();
+        $this->view->products          = array('all' => $this->lang->kanban->allProducts) + $this->feedback->getGrantProducts();
         $this->view->selectedProductID = $selectedProductID;
         $this->view->lanePairs         = $this->kanban->getLanePairsByGroup($groupID);
         $this->view->tickets2Imported  = $this->ticket->getTicketByProduct($selectedProductID, '', 'id_desc', $pager);

module/kanban/view/importticket.html.php

@@ -41,6 +41,7 @@
           </th>
           <th class='c-name'><?php echo $lang->ticket->title;?></th>
           <th class='c-pri'><?php echo $lang->ticket->priAB;?></th>
+          <th class='c-status'><?php echo $lang->ticket->status;?></th>
           <th class='c-type'><?php echo $lang->ticket->type;?></th>
           <th><?php echo $lang->ticket->createdDate;?></th>
           <th class='c-name'><?php echo $lang->ticket->assignedTo;?></th>
@@ -64,6 +65,7 @@
           <td title='<?php echo $ticket->title;?>'><?php echo $ticket->title;?></td>
           <?php endif;?>
           <td><span class='label-pri label-pri-<?php echo $ticket->pri;?>' title='<?php echo zget($this->lang->ticket->priList, $ticket->pri, $ticket->pri);?>'><?php echo zget($this->lang    ->ticket->priList, $ticket->pri, $ticket->pri); ?></span></td>
+          <td title='<?php echo zget($this->lang->ticket->statusList, $ticket->status, $ticket->status);?>'><?php echo zget($this->lang->ticket->statusList, $ticket->status, $ticket->status);?></td>
           <td title='<?php echo zget($this->lang->ticket->typeList, $ticket->type, $ticket->type);?>'><?php echo zget($this->lang->ticket->typeList, $ticket->type, $ticket->type);?></td>
           <td title='<?php echo $ticket->openedDate;?>'><?php echo $ticket->openedDate;?></td>
           <td title='<?php echo $ticket->assignedTo;?>'><?php echo $ticket->assignedTo;?></td>

module/misc/lang/de.php

@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.7']        = '2022-10-19';
 $lang->misc->releaseDate['17.6.2']      = '2022-09-23';
 $lang->misc->releaseDate['17.6.1']      = '2022-09-08';
 $lang->misc->releaseDate['17.6']        = '2022-08-26';
@@ -190,6 +191,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.7'][]       = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.2'][]     = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.1'][]     = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6'][]       = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');

module/misc/lang/en.php

@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.7']        = '2022-10-19';
 $lang->misc->releaseDate['17.6.2']      = '2022-09-23';
 $lang->misc->releaseDate['17.6.1']      = '2022-09-08';
 $lang->misc->releaseDate['17.6']        = '2022-08-26';
@@ -190,6 +191,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.7'][]       = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.2'][]     = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.1'][]     = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6'][]       = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');

module/misc/lang/fr.php

@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.7']        = '2022-10-19';
 $lang->misc->releaseDate['17.6.2']      = '2022-09-23';
 $lang->misc->releaseDate['17.6.1']      = '2022-09-08';
 $lang->misc->releaseDate['17.6']        = '2022-08-26';
@@ -190,6 +191,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.7'][]       = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.2'][]     = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6.1'][]     = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.6'][]       = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');

module/misc/lang/zh-cn.php

@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“
 $lang->misc->feature->visionsDesc    = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[迅捷界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions.png';
 
+$lang->misc->releaseDate['17.7']        = '2022-10-19';
 $lang->misc->releaseDate['17.6.2']      = '2022-09-23';
 $lang->misc->releaseDate['17.6.1']      = '2022-09-08';
 $lang->misc->releaseDate['17.6']        = '2022-08-26';
@@ -190,6 +191,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.7'][]       = array('title' => '过渡版本表格优化完成。新增工单功能，优化了反馈功能。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.6.2'][]     = array('title' => '禅道更新叶兰绿、禅道蓝、青春蓝三大主题。实现附件批量上传功能。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.6.1'][]     = array('title' => '优化了多人任务的处理逻辑，修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.6'][]       = array('title' => '优化了需求的处理逻辑，拆分了用需和软需的权限。甘特图支持手动拖拽维护任务关系。修复Bug。', 'desc' => '');

module/my/css/requirement.css

@@ -2,7 +2,7 @@
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.story-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px; left: 2px;}
 .table td.has-child > .story-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}

module/my/css/story.css

@@ -2,7 +2,7 @@
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.story-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px; left: 2px;}
 .table td.has-child > .story-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}

module/my/js/requirement.js

@@ -7,6 +7,7 @@ $(function()
         if($td.find('.label').length > 0) labelWidth = $td.find('.label').width();
         $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60);
     });
+    toggleFold('#myStoryForm', [], 0, 'requirement');
 
     $(document).on('click', '.story-toggle', function(e)
     {

module/my/view/requirement.html.php

@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+
 <?php js::set('mode', $mode);?>
 <?php js::set('total', $pager->recTotal);?>
 <?php js::set('rawMethod', $app->rawMethod);?>
@@ -79,7 +80,7 @@
         $canBeChanged = common::canBeChanged('story', $story);
         $spanClass    = $canBatchAction ? 'c-span' : '';
         ?>
-        <tr>
+        <tr data-id='<?php echo $story->id;?>' >
           <td class="c-id">
             <?php if($canBatchAction):?>
             <div class="checkbox-primary">
@@ -91,7 +92,7 @@
           </td>
           <td class='c-name nobr <?php if(!empty($story->children)) echo "has-child" ?>'>
             <?php echo common::hasPriv('requirement', 'view') ? html::a($storyLink, $story->title, null, "style='color: $story->color' data-group='product' title='$story->title'") : "<span title='$story->title'>$story->title</span>";?>
-            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
+            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';?>
           </td>
           <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span></td>

module/product/css/browse.css

@@ -21,7 +21,7 @@ a.removeModule:hover {color: red;}
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.story-toggle) {max-width: 90%; max-width: calc(100% - 50px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .story-toggle {color: #838a9d; position: relative; top: 1px; left: 2px;}
 .table td.has-child > .story-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .story-toggle > .icon:before {text-align: left;}

module/product/js/browse.js

@@ -11,7 +11,7 @@ $(function()
         var $title = $('#storyList thead th.c-title');
         var headerWidth = $('#storyList thead th.c-title a').innerWidth();
         var buttonWidth = $('#storyList thead th.c-title button').innerWidth();
-        if($title.width() < headerWidth + buttonWidth) $title.width(headerWidth + buttonWidth + 20);
+        if($title.width() < headerWidth + buttonWidth + 2) $title.width(headerWidth + buttonWidth + 30);
     });
 
     $('#storyList td.has-child .story-toggle').each(function()

module/product/lang/de.php

@@ -214,6 +214,7 @@ $lang->product->noMatched      = '"%s" kann nicht gefunden werden.' . $lang->pro
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+
 $lang->product->featureBar['browse']['reviewbyme']   = $lang->product->reviewByMe;
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['more']         = $lang->more;

module/product/lang/en.php

@@ -214,6 +214,7 @@ $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+
 $lang->product->featureBar['browse']['reviewbyme']   = $lang->product->reviewByMe;
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['more']         = $lang->more;

module/product/lang/fr.php

@@ -214,6 +214,7 @@ $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+
 $lang->product->featureBar['browse']['reviewbyme']   = $lang->product->reviewByMe;
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['more']         = $lang->more;

module/product/lang/zh-cn.php

@@ -223,6 +223,7 @@ $lang->product->featureBar['all']['all']      = '全部' . $lang->productCommon;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
+
 $lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
 $lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
 $lang->product->moreSelects['closedbyme']     = $lang->product->closedByMe;

module/product/model.php

@@ -1344,7 +1344,7 @@ class productModel extends model
     public function getExecutionPairsByProduct($productID, $branch = 0, $orderBy = 'id_asc', $projectID = 0, $mode = '')
     {
         if(empty($productID)) return array();
-        if(empty($projectID) or $this->config->systemMode == 'classic') return $this->getAllExecutionPairsByProduct($productID, $branch);
+        if(empty($projectID) or $this->config->systemMode == 'classic') return $this->getAllExecutionPairsByProduct($productID, $branch, '', $mode);
 
         $project = $this->loadModel('project')->getByID($projectID);
         $orderBy = $project->model == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
@@ -1399,13 +1399,14 @@ class productModel extends model
      * @param  int    $productID
      * @param  int    $branch
      * @param  int    $projectID
+     * @param  string $mode stagefilter or empty
      * @access public
      * @return array
      */
-    public function getAllExecutionPairsByProduct($productID, $branch = 0, $projectID = 0)
+    public function getAllExecutionPairsByProduct($productID, $branch = 0, $projectID = 0, $mode = '')
     {
         if(empty($productID)) return array();
-        $executions = $this->dao->select('t2.id,t2.project,t2.name,t2.grade,t2.parent')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+        $executions = $this->dao->select('t2.id,t2.project,t2.name,t2.grade,t2.parent,t2.attribute')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.product')->eq($productID)
             ->andWhere('t2.type')->in('stage,sprint,kanban')
@@ -1438,8 +1439,10 @@ class productModel extends model
                 $executionPairs = $executionPairs + $execution->children;
                 continue;
             }
-           if($this->config->systemMode == 'new' and isset($projectPairs[$execution->project])) $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
-           if($this->config->systemMode == 'classic') $executionPairs[$execution->id] = $execution->name;
+            /* Some stage of waterfall not need.*/
+            if(strpos($mode, 'stagefilter') !== false and in_array($execution->attribute, array('request', 'design', 'review'))) continue;
+            if($this->config->systemMode == 'new' and isset($projectPairs[$execution->project])) $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
+            if($this->config->systemMode == 'classic') $executionPairs[$execution->id] = $execution->name;
         }
 
         return $executionPairs;

module/programplan/lang/de.php

@@ -60,6 +60,9 @@ $lang->programplan->exporting        = 'Exporting';
 $lang->programplan->exportFail       = 'Export failed';
 $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
+$lang->programplan->delay            = 'Delay';
+$lang->programplan->delayDays        = 'Delay days';
+
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
 $lang->programplan->emptyBegin       = '『Begin』should not be blank';
@@ -70,6 +73,10 @@ $lang->programplan->checkEnd         = '『End』should be valid date';
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
 
+$lang->programplan->delayList = array();
+$lang->programplan->delayList[1] = 'Yes';
+$lang->programplan->delayList[0] = 'No';
+
 $lang->programplan->noData        = 'No Data';
 $lang->programplan->children      = 'Sub Plan';
 $lang->programplan->childrenAB    = 'Child';
@@ -80,15 +87,17 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
-$lang->programplan->ganttCustom['PM']           ='Manager';
-$lang->programplan->ganttCustom['deadline']     ='Deadline';
-$lang->programplan->ganttCustom['status']       ='Status';
-$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
-$lang->programplan->ganttCustom['realEnd']      ='Actual End';
-$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
-$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
-$lang->programplan->ganttCustom['estimate']     ='Estimate';
-$lang->programplan->ganttCustom['consumed']     ='Consumed';
+$lang->programplan->ganttCustom['PM']           = 'Manager';
+$lang->programplan->ganttCustom['deadline']     = 'Deadline';
+$lang->programplan->ganttCustom['status']       = 'Status';
+$lang->programplan->ganttCustom['realBegan']    = 'Actual Began';
+$lang->programplan->ganttCustom['realEnd']      = 'Actual End';
+$lang->programplan->ganttCustom['progress']     = 'Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] = 'Task Progress';
+$lang->programplan->ganttCustom['estimate']     = 'Estimate';
+$lang->programplan->ganttCustom['consumed']     = 'Consumed';
+$lang->programplan->ganttCustom['delay']        = 'Delay';
+$lang->programplan->ganttCustom['delayDays']    = 'Delay days';
 
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"Workload %" must be digits.';

module/programplan/lang/en.php

@@ -87,15 +87,15 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
-$lang->programplan->ganttCustom['PM']           ='Manager';
-$lang->programplan->ganttCustom['deadline']     ='Deadline';
-$lang->programplan->ganttCustom['status']       ='Status';
-$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
-$lang->programplan->ganttCustom['realEnd']      ='Actual End';
-$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
-$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
-$lang->programplan->ganttCustom['estimate']     ='Estimate';
-$lang->programplan->ganttCustom['consumed']     ='Consumed';
+$lang->programplan->ganttCustom['PM']           = 'Manager';
+$lang->programplan->ganttCustom['deadline']     = 'Deadline';
+$lang->programplan->ganttCustom['status']       = 'Status';
+$lang->programplan->ganttCustom['realBegan']    = 'Actual Began';
+$lang->programplan->ganttCustom['realEnd']      = 'Actual End';
+$lang->programplan->ganttCustom['progress']     = 'Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] = 'Task Progress';
+$lang->programplan->ganttCustom['estimate']     = 'Estimate';
+$lang->programplan->ganttCustom['consumed']     = 'Consumed';
 $lang->programplan->ganttCustom['delay']        = 'Delay';
 $lang->programplan->ganttCustom['delayDays']    = 'Delay days';
 

module/programplan/lang/fr.php

@@ -60,6 +60,9 @@ $lang->programplan->exporting        = 'Exporting';
 $lang->programplan->exportFail       = 'Export failed';
 $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
+$lang->programplan->delay            = 'Delay';
+$lang->programplan->delayDays        = 'Delay days';
+
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
 $lang->programplan->emptyBegin       = '『Begin』should not be blank';
@@ -70,6 +73,10 @@ $lang->programplan->checkEnd         = '『End』should be valid date';
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
 
+$lang->programplan->delayList = array();
+$lang->programplan->delayList[1] = 'Yes';
+$lang->programplan->delayList[0] = 'No';
+
 $lang->programplan->noData        = 'No Data';
 $lang->programplan->children      = 'Sub Plan';
 $lang->programplan->childrenAB    = 'Child';
@@ -80,15 +87,17 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
-$lang->programplan->ganttCustom['PM']           ='Manager';
-$lang->programplan->ganttCustom['deadline']     ='Deadline';
-$lang->programplan->ganttCustom['status']       ='Status';
-$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
-$lang->programplan->ganttCustom['realEnd']      ='Actual End';
-$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
-$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
-$lang->programplan->ganttCustom['estimate']     ='Estimate';
-$lang->programplan->ganttCustom['consumed']     ='Consumed';
+$lang->programplan->ganttCustom['PM']           = 'Manager';
+$lang->programplan->ganttCustom['deadline']     = 'Deadline';
+$lang->programplan->ganttCustom['status']       = 'Status';
+$lang->programplan->ganttCustom['realBegan']    = 'Actual Began';
+$lang->programplan->ganttCustom['realEnd']      = 'Actual End';
+$lang->programplan->ganttCustom['progress']     = 'Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] = 'Task Progress';
+$lang->programplan->ganttCustom['estimate']     = 'Estimate';
+$lang->programplan->ganttCustom['consumed']     = 'Consumed';
+$lang->programplan->ganttCustom['delay']        = 'Delay';
+$lang->programplan->ganttCustom['delayDays']    = 'Delay days';
 
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"Workload %" must be digits.';

module/project/view/bug.html.php

@@ -17,6 +17,7 @@
 #subHeader #dropMenu .col-left {padding-bottom: 0px;}
 #currentBranch + #dropMenu .col-left {padding-bottom: 30px;}
 .c-deadline {text-align: center;}
+#mainContent .main-col {padding-bottom: 20px;}
 </style>
 <div id="mainMenu" class="clearfix main-row fade in">
   <div id="sidebarHeader">

module/project/view/execution.html.php

@@ -79,14 +79,14 @@
               <?php endif;?>
             </div>
           </th>
-          <th class='c-user'><?php echo $lang->execution->owner;?></th>
           <th class='c-status text-center'><?php echo $lang->project->status;?></th>
-          <th class='c-hours'><?php echo $lang->project->progress;?></th>
+          <th class='c-user'><?php echo $lang->execution->owner;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>
           <th class='c-date'><?php echo $lang->programplan->end;?></th>
           <th class='c-hours text-right'><?php echo $lang->task->estimateAB;?></th>
           <th class='c-hours text-right'><?php echo $lang->task->consumedAB;?></th>
           <th class='c-hours text-right'><?php echo $lang->task->leftAB;?> </th>
+          <th class='c-hours'><?php echo $lang->project->progress;?></th>
           <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
           <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
         </tr>

module/stage/model.php

@@ -123,13 +123,13 @@ class stageModel extends model
      */
     public function getStages($orderBy = 'id_desc', $projectID = 0)
     {
-        $stages = $this->dao->select('t1.id,name,type,percent,openedBy as createdBy,begin as createdDate,lastEditedBy as editedBy,end as editedDate,deleted')
-            ->from(TABLE_EXECUTION)->alias('t1')
-            ->where('t1.type')->in('sprint,stage,kanban')
-            ->andWhere('t1.deleted')->eq('0')
-            ->andWhere('t1.vision')->eq($this->config->vision)
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
-            ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
+        $stages = $this->dao->select('id,name,type,percent,openedBy as createdBy,begin as createdDate,lastEditedBy as editedBy,end as editedDate,deleted')
+            ->from(TABLE_EXECUTION)
+            ->where('type')->in('sprint,stage,kanban')
+            ->andWhere('deleted')->eq('0')
+            ->andWhere('vision')->eq($this->config->vision)
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
+            ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
             ->orderBy($orderBy)
             ->fetchAll('id');
         $stages = !empty($stages) ? $stages : $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->orderBy($orderBy)->fetchAll('id');

module/task/css/activate.css

@@ -0,0 +1 @@
+#taskTeamEditor tr .input-control {display: inline-block; width: 130px;}

module/task/css/common.css

@@ -1,8 +1,7 @@
 .body-modal > .main {padding: 20px;}
 .body-modal > .main .table-form {border: 1px solid #ddd;}
 
-#modalTeam .modal-dialog {padding-bottom: 20px;}
-#modalTeam .modal-content {padding: 0 0 5px; height: 340px;}
+#modalTeam .modal-content {padding: 0 0 5px; min-height: 120px;}
 #modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px !important; overflow-y: scroll !important;}
 #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
@@ -14,7 +13,7 @@
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
 #taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;}
 #taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
-#taskTeamEditor tr .input-control {display: inline-block; width: 130px; }
+#taskTeamEditor tr .input-control {display: inline-block; width: 110px;}
 #taskTeamEditor tr .input-control + .input-control {margin-left: 12px; border-left: 1px solid #eee;}
 #modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
@@ -24,4 +23,4 @@
 #modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;}
 #modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;}
 #modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;}
-#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}

module/task/css/create.css

@@ -28,6 +28,6 @@
 .c-modulel {width: 110px;}
 
 .keep-row-height {height: 32px;}
-#modalTeam .modal-dialog {height: 340px; width: 520px; color: #3c4353;}
+#modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
 #taskTeamEditor .chosen-single {width: 200px;}
 #taskTeamEditor .estimateBox {width: 120px;}

module/task/css/edit.css

@@ -5,3 +5,4 @@
 #storyIdBox .chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li {text-overflow: unset;}
 
 #modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
+#taskTeamEditor tr .input-control {display: inline-block; width: 130px;}

module/task/model.php

@@ -4053,14 +4053,14 @@ class taskModel extends model
             }
         }
         $list .= '</td>';
-        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
         $list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
-        $list .= '<td></td>';
+        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
         $list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';
         $list .= helper::isZeroDate($task->deadline) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->deadline . '</td>';
-        $list .= '<td>' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
-        $list .= '<td>' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
-        $list .= '<td>' . $task->left . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td class="hours text-right">' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td class="hours text-right">' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td class="hours text-right">' . $task->left . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td></td>';
         $list .= '<td></td>';
         $list .= '<td class="c-actions">';
         $list .= $this->buildOperateMenu($task, 'browse');

module/testtask/control.php

@@ -246,7 +246,7 @@ class testtask extends control
 
         /* Create testtask from testtask of test.*/
         $productID  = $productID ? $productID : key($this->products);
-        $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID);
+        $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID, 'stagefilter');
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk');
 
         $execution = $this->loadModel('execution')->getByID($executionID);

module/tree/control.php

@@ -45,11 +45,11 @@ class tree extends control
             $products = $this->product->getProducts($this->session->project, 'all', '', false);
             if($viewType == 'case') $this->lang->modulePageNav = $this->product->select($products, $rootID, 'tree', 'browse', 'case', $branch);
         }
-        else if($this->app->tab == 'feedback' or $this->app->tab == 'ticket')
+        else if($this->app->tab == 'feedback')
         {
             $products = $this->loadModel('feedback')->getGrantProducts();
             if(!$rootID) $rootID = key($products);
-            $this->loadModel('feedback')->setMenu($rootID);
+            $this->loadModel('feedback')->setMenu($rootID, $viewType, $viewType);
         }
 
         /* According to the type, set the module root and modules. */

module/tree/lang/de.php

@@ -50,6 +50,7 @@ $lang->tree->successSave          = 'Saved.';
 $lang->tree->successFixed         = 'Fixed.';
 $lang->tree->repeatName           = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
+$lang->tree->syncProductModule    = 'Sync Module';
 
 $lang->tree->module       = 'Modul';
 $lang->tree->name         = 'Name';

module/tree/lang/en.php

@@ -50,6 +50,7 @@ $lang->tree->successSave          = 'Saved.';
 $lang->tree->successFixed         = 'Fixed.';
 $lang->tree->repeatName           = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
+$lang->tree->syncProductModule    = 'Sync Module';
 
 $lang->tree->module       = 'Module';
 $lang->tree->name         = 'Module Name';

module/tree/lang/fr.php

@@ -50,6 +50,7 @@ $lang->tree->successSave          = 'Sauvé.';
 $lang->tree->successFixed         = 'Corrigé.';
 $lang->tree->repeatName           = 'Le nom "%s" existe déjà !';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
+$lang->tree->syncProductModule    = 'Sync Module';
 
 $lang->tree->module       = 'Module';
 $lang->tree->name         = 'Nom';

module/tree/model.php

@@ -84,7 +84,11 @@ class treeModel extends model
         /* If feedback module is merge add story module.*/
         $syncConfig = json_decode($this->config->global->syncProduct, true);
         $syncConfig = isset($syncConfig[$type]) ? $syncConfig[$type] : array();
-        if(($type == 'feedback' or $type == 'ticket') and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID])) $type = 'story,' . $type;
+        if(($type == 'feedback' or $type == 'ticket') and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID]))
+        {
+            $grade = $syncConfig[$rootID];
+            $type  = 'story,' . $type;
+        }
         if($this->isMergeModule($rootID, $type))
         {
             return $this->dao->select('*')->from(TABLE_MODULE)
@@ -107,7 +111,7 @@ class treeModel extends model
             ->where('1=1')
             ->beginIF($type != 'feedback' or !empty($rootID))->andwhere('root')->eq((int)$rootID)->fi()
             ->andWhere('type')->in($type)
-            ->beginIF($grade)->andWhere('grade')->lt($grade)->fi()
+            ->beginIF($grade)->andWhere('grade')->le($grade)->fi()
             ->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
             ->beginIF($branch !== 'all' and $branch !== '' and $branch !== false)
             ->andWhere('(branch')->eq(0)

module/tree/view/browse.html.php

@@ -330,6 +330,11 @@ $(function()
     $('#subNavbar > ul > li > a[href*=tree][href*=browse]').not('[href*=<?php echo $viewType;?>]').parent().removeClass('active');
     if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
     if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active');
+    if(viewType == 'ticket')
+    {
+        $('#navbar li[data-id="browse"]').removeClass('active');
+        $('#navbar li[data-id="' + viewType +'"]').addClass('active');
+    }
 });
 
 if("<?php $from == 'doc'?>") parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});

module/upgrade/config.php

@@ -26,6 +26,7 @@ $config->upgrade->maxVersion['max3_6']       = '17_5';
 $config->upgrade->maxVersion['max3_6_1']     = '17_6';
 $config->upgrade->maxVersion['max3_6_2']     = '17_6_1';
 $config->upgrade->maxVersion['max3_6_3']     = '17_6_2';
+$config->upgrade->maxVersion['max3_7']       = '17_7';
 
 $config->upgrade->bizVersion = array();
 $config->upgrade->bizVersion['biz1_0']       = '9_5_1';
@@ -90,6 +91,7 @@ $config->upgrade->bizVersion['biz7_5']       = '17_5';
 $config->upgrade->bizVersion['biz7_6']       = '17_6';
 $config->upgrade->bizVersion['biz7_6_1']     = '17_6_1';
 $config->upgrade->bizVersion['biz7_6_2']     = '17_6_2';
+$config->upgrade->bizVersion['biz7_7']       = '17_7';
 
 $config->upgrade->proVersion = array();
 $config->upgrade->proVersion['pro1_0']        = '3_1';

module/upgrade/lang/version.php

@@ -167,6 +167,7 @@ $lang->upgrade->fromVersions['17_5']       = '17.5';
 $lang->upgrade->fromVersions['17_6']       = '17.6';
 $lang->upgrade->fromVersions['17_6_1']     = '17.6.1';
 $lang->upgrade->fromVersions['17_6_2']     = '17.6.2';
+$lang->upgrade->fromVersions['17_7']       = '17.7';
 
 global $config;
 /* Lite. */
@@ -338,6 +339,7 @@ $lang->upgrade->fromVersions['biz7_5']       = 'Biz7.5';
 $lang->upgrade->fromVersions['biz7_6']       = 'Biz7.6';
 $lang->upgrade->fromVersions['biz7_6_1']     = 'Biz7.6.1';
 $lang->upgrade->fromVersions['biz7_6_2']     = 'Biz7.6.2';
+$lang->upgrade->fromVersions['biz7_7']       = 'Biz7.7';
 
 /* Max. */
 $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -365,3 +367,4 @@ $lang->upgrade->fromVersions['max3_5']       = 'Max3.5';
 $lang->upgrade->fromVersions['max3_6']       = 'Max3.6';
 $lang->upgrade->fromVersions['max3_6_1']     = 'Max3.6.1';
 $lang->upgrade->fromVersions['max3_6_2']     = 'Max3.6.2';
+$lang->upgrade->fromVersions['max3_6_3']     = 'Max3.6.3';

module/upgrade/model.php

@@ -560,6 +560,13 @@ class upgradeModel extends model
             case '17_6_1':
                 $this->updateProductView();
                 break;
+            case '17_6_2':
+                if(!$executedXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.4.sql';
+                    $this->execSQL($xuanxuanSql);
+                }
+                break;
         }
 
         $this->deletePatch();
@@ -1030,6 +1037,10 @@ class upgradeModel extends model
                 $confirmContent .= file_get_contents($this->getUpgradeFile('17.6'));
             case '17_6_1':
                 $confirmContent .= file_get_contents($this->getUpgradeFile('17.6.1'));
+            case '17_6_2':
+                $confirmContent .= file_get_contents($this->getUpgradeFile('17.6.2'));
+                $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.4.sql';
+                $confirmContent .= file_get_contents($xuanxuanSql);
         }
 
         return $confirmContent;

www/js/my.full.js

@@ -834,7 +834,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     $parentTd = $form.find('td.has-child');
     if($parentTd.length == 0) return false;
 
-    var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
+    var toggleClass = ['product', 'requirement'].includes(objectType) ? 'story-toggle' : 'task-toggle';
     var nameClass   = ['product', 'productplan'].indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
     $form.find('th.' + nameClass).addClass('clearfix').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 

xuanxuan/XUANVERSION

@@ -1 +1 @@
-v6.4.0
+v6.5.0

xuanxuan/XVERSION

@@ -1 +1 @@
-6.4
+6.5