From 3356617455091f5aeac895e80b7210832f3f341d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 22 Jun 2022 05:35:34 +0000 Subject: [PATCH 1/4] * Finish task#57878. --- module/task/view/report.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 254ddd04cc..2304d446e3 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -62,7 +62,7 @@ task->report->$chartType->item;?> task->report->value;?> - report->percent;?> + report->percent;?> From df2ef74d07eff9b17de3973c5adcd01507e9f0ff Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 22 Jun 2022 08:23:43 +0000 Subject: [PATCH 2/4] * Finish task#57878. --- module/block/view/todoblock.html.php | 37 +++++++++++++++++++--------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 5cbf385323..3b22e87883 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -21,10 +21,10 @@ if(!$selfCall) die(include('./todolist.html.php')); .block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden} .block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;} .block-todoes .todoes > li:hover {background-color: #e9f2fb;} -.block-todoes .todo-title {padding: 5px 15px 5px 5px;} -.titleBox {max-width: 700px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;} +.block-todoes .todo-title {padding: 0px;} +.titleBox {max-width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;} .block-todoes .todo-pri {margin: 0 5px;} -.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px;} +.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px; min-width: 95px;} .block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;} .block-todoes .todo-check:hover {border-color: #8e939a;} .block-todoes .active > .todo-check {color: #00da88; background: transparent;border: none;} @@ -34,6 +34,9 @@ if(!$selfCall) die(include('./todolist.html.php')); .block-todoes .todoes-form > .form-group:last-child {margin-bottom: 0;} .block-todoes .todoes-form > h3 {padding: 0 20px 15px; margin: 0 -20px 5px; font-size: 14px; line-height: 20px;} .block-todoes.show-form .todoes-form {visibility: visible; opacity: 1;} +.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;}
@@ -97,14 +100,17 @@ if(!$selfCall) die(include('./todolist.html.php')); ?>
  • - > - date == '2030-01-01') :?> - todo->periods['future'] ?> - - date)) . ' ' . $todo->begin;?> - - todo->priList, $todo->pri);?> - name;?> + > +
    + date == '2030-01-01') :?> +
    todo->periods['future'] ?>
    + +
    date)) . ' ' . $todo->begin;?>
    + +
    todo->priList, $todo->pri);?>
    +
    name;?>
    +
    +
    • @@ -166,6 +172,15 @@ if(!$selfCall) die(include('./todolist.html.php')); if(!isFinished) $liTag.addClass('active'); if(isFinished) $liTag.removeClass('active'); }); + + if(isFinished) + { + $(this).next().find('.label-todo').addClass('hidden'); + } + else + { + $(this).next().find('.label-todo').removeClass('hidden'); + } }); }); From 3d1a9eb517ab63ba7f30cca8d58851d5786112de Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 22 Jun 2022 08:48:19 +0000 Subject: [PATCH 3/4] * Finish task#57878. --- module/block/view/todoblock.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 3b22e87883..dabc522d19 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -22,7 +22,7 @@ if(!$selfCall) die(include('./todolist.html.php')); .block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;} .block-todoes .todoes > li:hover {background-color: #e9f2fb;} .block-todoes .todo-title {padding: 0px;} -.titleBox {max-width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;} +.titleBox {max-width: 700px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;} .block-todoes .todo-pri {margin: 0 5px;} .block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px; min-width: 95px;} .block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;} @@ -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;} +[lang^='en'] .block-todoes .todo-pri {width: 60px; min-width: 60px;}
    From aeaf5175133eb17163cb7ba5b195aa065fcc52b0 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 22 Jun 2022 09:17:10 +0000 Subject: [PATCH 4/4] * Keep 2 decimal places. --- module/task/view/report.html.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 2304d446e3..94a89e6af7 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -71,7 +71,9 @@ name;?> value;?> - percent * 100) . '%';?> + percent * 100;?> + +