* Finish task #115093, modify the style of project statistic block.

2024-04-02 15:14:19 +08:00
parent b60efebe1d
commit b7fc887813
6 changed files with 33 additions and 33 deletions
@@ -2,11 +2,12 @@
 .projectstatistic-block .tab-content {width: 78%;}
 .projectstatistic-block.block-sm .tab-content {width: 100%;}

-.projectstatistic-block .project-statistic-table table {width: 100%; border-collapse: separate; border-spacing: 0 0.5rem; padding-right: 1rem;}
+.projectstatistic-block .project-statistic-table table {width: 100%; border-collapse: separate; border-spacing: 0 0.5rem;}
 .projectstatistic-block .project-statistic-table table th {padding-right: 0px; margin-top: 1rem; font-size: 12px;}
 .projectstatistic-block .project-statistic-table table td {padding-left: 0px; margin-top: 1rem;}
 .projectstatistic-block .tab-pane .nav-tabs>.nav-item>a:after {border-bottom: none;}
-.projectstatistic-block .scrum table th, .projectstatistic-block .scrum table td {width: 50%}
+.projectstatistic-block .scrum table th {width: 45%;}
+.projectstatistic-block .scrum table td {width: 55%}
 .projectstatistic-block .waterfall table th {width: 100px;}
 .projectstatistic-block .table-data {overflow: hidden;}
 .projectstatistic-block .table-data td {white-space: nowrap;}
@@ -581,8 +581,8 @@ $lang->block->projectstatistic->day              = 'day';
 $lang->block->projectstatistic->hour             = 'hour';
 $lang->block->projectstatistic->leftDaysPre      = 'Before the end has ';
 $lang->block->projectstatistic->delayDaysPre     = 'Has been delayed for ';
-$lang->block->projectstatistic->existRisks       = 'Risks:';
-$lang->block->projectstatistic->existIssues      = 'Issues:';
+$lang->block->projectstatistic->existRisks       = 'Risks';
+$lang->block->projectstatistic->existIssues      = 'Issues';
 $lang->block->projectstatistic->lastestExecution = 'Lastest Execution';
 $lang->block->projectstatistic->projectClosed    = "{$lang->projectCommon} has been closed.";
 $lang->block->projectstatistic->longTimeProject  = "Long Time {$lang->projectCommon}";
@@ -581,8 +581,8 @@ $lang->block->projectstatistic->day              = 'day';
 $lang->block->projectstatistic->hour             = 'hour';
 $lang->block->projectstatistic->leftDaysPre      = 'Before the end has ';
 $lang->block->projectstatistic->delayDaysPre     = 'Has been delayed for ';
-$lang->block->projectstatistic->existRisks       = 'Risks:';
-$lang->block->projectstatistic->existIssues      = 'Issues:';
+$lang->block->projectstatistic->existRisks       = 'Risks';
+$lang->block->projectstatistic->existIssues      = 'Issues';
 $lang->block->projectstatistic->lastestExecution = 'Lastest Execution';
 $lang->block->projectstatistic->projectClosed    = "{$lang->projectCommon} has been closed.";
 $lang->block->projectstatistic->longTimeProject  = "Long Time {$lang->projectCommon}";
@@ -581,8 +581,8 @@ $lang->block->projectstatistic->day              = 'day';
 $lang->block->projectstatistic->hour             = 'hour';
 $lang->block->projectstatistic->leftDaysPre      = 'Before the end has ';
 $lang->block->projectstatistic->delayDaysPre     = 'Has been delayed for ';
-$lang->block->projectstatistic->existRisks       = 'Existing Risks:';
-$lang->block->projectstatistic->existIssues      = 'Existing Issues:';
+$lang->block->projectstatistic->existRisks       = 'Existing Risks';
+$lang->block->projectstatistic->existIssues      = 'Existing Issues';
 $lang->block->projectstatistic->lastestExecution = 'Lastest Execution';
 $lang->block->projectstatistic->projectClosed    = "{$lang->projectCommon} has been closed.";
 $lang->block->projectstatistic->longTimeProject  = "Long Time {$lang->projectCommon}";
@@ -581,8 +581,8 @@ $lang->block->projectstatistic->day              = '天';
 $lang->block->projectstatistic->hour             = 'h';
 $lang->block->projectstatistic->leftDaysPre      = '距项目结束还剩';
 $lang->block->projectstatistic->delayDaysPre     = '项目已延期';
-$lang->block->projectstatistic->existRisks       = '存在风险：';
-$lang->block->projectstatistic->existIssues      = '存在问题：';
+$lang->block->projectstatistic->existRisks       = '存在风险';
+$lang->block->projectstatistic->existIssues      = '存在问题';
 $lang->block->projectstatistic->lastestExecution = '最新执行';
 $lang->block->projectstatistic->projectClosed    = "{$lang->projectCommon}已关闭";
 $lang->block->projectstatistic->longTimeProject  = "长期{$lang->projectCommon}";
@@ -36,11 +36,11 @@ if($project)
        setClass('text-left'),
        $project->status != 'closed' && $project->end != LONG_TIME ? span
        (
-            setClass('text-gray'),
+            setClass('text-gray block'),
            $remainingDays >= 0 ? $lang->block->projectstatistic->leftDaysPre : $lang->block->projectstatistic->delayDaysPre,
            span
            (
-                setClass('font-bold text-black px-1'),
+                setClass('font-bold text-gray-950 px-1'),
                abs($remainingDays)
            ),
            $lang->block->projectstatistic->day
@@ -50,17 +50,17 @@ if($project)
            $project->status == 'closed' ? $lang->block->projectstatistic->projectClosed : $lang->block->projectstatistic->longTimeProject
        )
    );
+    $projectOverview[] = $config->edition != 'open' ? div(setClass('divider mx-1 my-auto h-4')) : null;
    $projectOverview[] = $config->edition != 'open' ? cell
    (
-        setClass('flex-1 text-left' . (!$longBlock ? ' w-full' : '')),
-        icon('bullhorn text-warning'),
+        setClass('flex-0 text-left' . (!$longBlock ? ' w-full' : '')),
        span
        (
-            setClass('text-gray mr-5'),
+            setClass('text-gray mr-4'),
            $lang->block->projectstatistic->existRisks,
            span
            (
-                setClass('font-bold text-warning'),
+                setClass('font-bold ml-2 text-danger'),
                $project->risks
            )
        ),
@@ -70,7 +70,7 @@ if($project)
            $lang->block->projectstatistic->existIssues,
            span
            (
-                setClass('font-bold text-warning'),
+                setClass('font-bold ml-2 text-gray-950'),
                $project->issues
            )
        )
@@ -78,7 +78,7 @@ if($project)

    $lastestExecution = !empty($project->executions) && $project->multiple ? cell
    (
-        setClass('flex flex-1 overflow-hidden whitespace-nowrap clip w-full' . (!$longBlock ? ' text-left w-full' : '')),
+        setClass('flex overflow-hidden whitespace-nowrap clip w-full' . (!$longBlock ? ' flex-0 text-left w-full' : ' flex-1')),
        span
        (
            setClass('text-gray'),
@@ -95,7 +95,7 @@ if($project)
                $project->executions[0]->name
            )
        )
-    ) : null;
+    ) : div();

    $cells = array();
    if(in_array($project->model, array('scrum', 'kanban', 'agileplus')))
@@ -148,14 +148,13 @@ if($project)
            }
            $cells[] = cell
            (
-                setClass('flex-1 overflow-hidden whitespace-nowrap project-statistic-table scrum' . (($module != 'cost' && $longBlock) || ($module != 'task' && $module != 'cost' && !$longBlock) ? ' border-l pl-4 ' : ' ml-4') . (!$longBlock && $module != 'cost' && $module != 'story'? ' border-t' : '')),
-                set::width($longBlock ? ($module == 'cost' ? 'calc(25% - 1rem)' : '25%') : 'calc(50% - 1rem)'),
+                setClass('flex-1 overflow-hidden whitespace-nowrap project-statistic-table scrum bg-gray-50 border border-1 pt-2 px-1'),
+                set::width($longBlock ? '25%' : 'calc(50% - 1rem)'),
                div
                (
-                    setClass('pt-1'),
                    span
                    (
-                        setClass('font-bold'),
+                        setClass('font-bold ml-3'),
                        $lang->block->projectstatistic->{$module}
                    )
                ),
@@ -208,14 +207,14 @@ if($project)
        );
        $cells[] = cell
        (
-            setClass('project-statistic-table waterfall pl-4' . ($longBlock ? ' border-l' : ' mt-4')),
-            set::width($longBlock ? '32%' : '50%'),
+            setClass('project-statistic-table waterfall bg-gray-50 border border-1 pt-2 px-1'),
+            set::width($longBlock ? '32%' : 'calc(50% - 0.25rem)'),
            div
            (
                setClass('w-full'),
                span
                (
-                    setClass('font-bold'),
+                    setClass('font-bold ml-3'),
                    $lang->project->progress
                )
            ),
@@ -309,14 +308,14 @@ if($project)
        );
        $cells[] = cell
        (
-            setClass('project-statistic-table waterfall pl-4 border-l' . (!$longBlock ? ' mt-3' : '')),
-            set::width($longBlock ? '32%' : '50%'),
+            setClass('project-statistic-table waterfall bg-gray-50 border border-1 pt-2 px-1'),
+            set::width($longBlock ? '32%' : 'calc(50% - 0.25rem)'),
            div
            (
                setClass('w-full'),
                span
                (
-                    setClass('font-bold'),
+                    setClass('font-bold ml-3'),
                    $lang->block->projectstatistic->currentCost
                )
            ),
@@ -422,13 +421,13 @@ statisticBlock
    (
        div
        (
-            setClass('flex bg-white leading-6 px-2 py-1 mt-1 mx-3 items-center gap-x-2 justify-between' . ($longBlock ? ' h-10 mb-6 flex-nowrap' : 'h-20 mb-4 flex-wrap')),
-            $projectOverview,
-            $lastestExecution
+            setClass('flex bg-white leading-6 px-2 py-1 mt-1 mx-3 items-center gap-x-2 gap-y-1 justify-between' . ($longBlock ? ' h-10 my-3 flex-nowrap' : ' h-14 mb-1 flex-wrap')),
+            $lastestExecution,
+            div(setClass('flex justify-end gap-x-2 nowrap'), $projectOverview)
        ),
        div
        (
-            setClass('flex' . (!$longBlock ? ' flex-wrap' : '')),
+            setClass('flex gap-2 p-3 pt-1' . (!$longBlock ? ' flex-wrap gap-y-3' : ' pt-0')),
            $cells
        )
    ) : null