diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php index e18d52847f..f4de1d3f1b 100644 --- a/lib/dao/dao.class.php +++ b/lib/dao/dao.class.php @@ -263,12 +263,11 @@ class dao extends baseDAO continue; } - if(!isset($this->sqlobj->data->{$field->field})) $this->sqlobj->data->{$field->field} = false; - /* Check rules of fields. */ foreach($field->ruleData as $rule) { if(empty($rule)) continue; + if(!isset($this->sqlobj->data->{$field->field})) continue; if($rule->type == 'system') { diff --git a/module/action/model.php b/module/action/model.php index 8e56b53a8c..a78014d11e 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -50,7 +50,7 @@ class actionModel extends model $action->extra = $extra; if(!defined('IN_UPGRADE')) $action->vision = $this->config->vision; - if($objectType == 'story' and strpos(',reviewpassed,reviewrejected,reviewclarified,', ",$actionType,") !== false) $action->actor = $this->lang->action->system; + if($objectType == 'story' and strpos(',reviewpassed,reviewrejected,reviewclarified,reviewreverted,', ",$actionType,") !== false) $action->actor = $this->lang->action->system; /* Use purifier to process comment. Fix bug #2683. */ $action->comment = fixer::stripDataTags($comment); diff --git a/module/block/control.php b/module/block/control.php index 18ba598678..be5f5c87d3 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -1208,14 +1208,14 @@ class block extends control $this->weekly->save($this->session->project, $date); - $this->view->pv = $this->weekly->getPV($this->session->project, $today); - $this->view->ev = $this->weekly->getEV($this->session->project, $today); - $this->view->ac = $this->weekly->getAC($this->session->project, $today); + $this->view->pv = (float)$this->weekly->getPV($this->session->project, $today); + $this->view->ev = (float)$this->weekly->getEV($this->session->project, $today); + $this->view->ac = (float)$this->weekly->getAC($this->session->project, $today); $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv); $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac); $this->view->current = $current; - $this->view->progress = ($task->totalConsumed + $task->totalLeft) ? floor($task->totalConsumed / ($task->totalConsumed + $task->totalLeft) * 1000) / 1000 * 100 : 0; + $this->view->progress = !empty($this->view->pv) ? floor($this->view->ac / $this->view->pv * 1000) / 1000 * 100 : 0; } /** diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 81b1c76209..65e41c4388 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -37,6 +37,7 @@ if(!$selfCall) die(include('./todolist.html.php')); .block-todoes .todo-flexbetween {display: flex; justify-content: space-between;} .block-todoes #todoList {display: flex; overflow: hidden;} .block-todoes .label-todo {width: 50px; min-width: 50px!important; border: none; color: #43A047;} +.block-todoes .todo-title.text-ellipsis {text-overflow: unset;} [lang^='en'] .block-todoes .todo-pri {width: 60px; min-width: 60px;}