+
+
+
+
+
+
+
+ Progress: {{ round($goalStats['avgPercentComplete']) }}%
+ +
+
+
+
+
+
+
+ On Track
+ {{ $goalStats['goalsOnTrack'] }} +
+
+
+
+ At Risk
+ {{ $goalStats['goalsAtRisk'] }} +
+
+
+
+ Miss
+ {{ $goalStats['goalsMiss'] }} +
+
+
+viewFactory->make(
+ $tpl->getTemplatePath('canvas', 'showCanvasBottom'),
+ array_merge($__data, ['canvasName' => 'goal'])
+)->render(); ?>
+
+@endsection
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/dashboard.tpl.php b/app/Domain/Goalcanvas/Templates/dashboard.tpl.php
deleted file mode 100644
index dddd1fcfb1..0000000000
--- a/app/Domain/Goalcanvas/Templates/dashboard.tpl.php
+++ /dev/null
@@ -1,724 +0,0 @@
- $val) {
- $$var = $val; // necessary for blade refactor
-}
-$canvasName = 'goal';
-$elementName = 'goal';
-
-
-/**
- * showCanvasTop.inc template - Top part of the main canvas page
- *
- * Required variables:
- * - $canvasName Name of current canvas
- */
-
-$canvasTitle = '';
-$allCanvas = $tpl->get('allCanvas');
-$canvasIcon = $tpl->get('canvasIcon');
-$canvasTypes = $tpl->get('canvasTypes');
-$statusLabels = $statusLabels ?? $tpl->get('statusLabels');
-$relatesLabels = $relatesLabels ?? $tpl->get('relatesLabels');
-$dataLabels = $tpl->get('dataLabels');
-$disclaimer = $tpl->get('disclaimer');
-$canvasItems = $tpl->get('canvasItems');
-
-$filter['status'] = $_GET['filter_status'] ?? (session("filter_status") ?? 'all');
-session(["filter_status" => $filter['status']]);
-$filter['relates'] = $_GET['filter_relates'] ?? (session("filter_relates") ?? 'all');
-session(["filter_relates" => $filter['relates']]);
-
-//get canvas title
-foreach ($tpl->get('allCanvas') as $canvasRow) {
- if ($canvasRow["id"] == $tpl->get('currentCanvas')) {
- $canvasTitle = $canvasRow["title"];
- $canvasId = $canvasRow["id"];
- break;
- }
-}
-
-$goalStats = $tpl->get("goalStats");
-
-?>
-
-
-
+
+
+ @if (count($allCanvas) > 0)
+ @foreach ($tpl->get('allCanvas') as $canvasRow)
+
+
+ @php
+ $canvasSvc = app()->make(Goalcanvas::class);
+ $canvasItems = $canvasSvc->getCanvasItemsById($canvasRow["id"]);
+ @endphp
+
+ @endforeach
+ @endif
+
+
+
+
+
+
+
+
+ @if (!is_countable($canvasItems) || count($canvasItems) == 0)
+
+ No goals on this board yet. Open the board to start adding goals
+ @endif
+ @foreach ($canvasItems as $row)
+ @php
+ $filterStatus = $filter['status'] ?? 'all';
+ $filterRelates = $filter['relates'] ?? 'all';
+ @endphp
+ @if ($row['box'] === $elementName && ($filterStatus == 'all' || $filterStatus == $row['status']) && ($filterRelates == 'all' || $filterRelates == $row['relates']))
+ @php
+ $comments = app()->make(Comments::class);
+ $nbcomments = $comments->countComments(moduleId: $row['id']);
+ @endphp
+
+
+ @endif
+ @endforeach
+
+
+
+
+
+
+ @if ($row['milestoneHeadline'] != '')
+
+
+ Metric: {{ $tpl->escape($row["description"]) }} +
+ + @php + $percentDone = $row["goalProgress"]; + $metricTypeFront = ''; + $metricTypeBack = ''; + if ($row["metricType"] == "percent") { + $metricTypeBack = '%'; + } elseif ($row["metricType"] == "currency") { + $metricTypeFront = __("language.currency"); + } + @endphp + +
+
+ @if ($login::userIsAtLeast($roles::$editor))
+
+
+
+ @endif
+ @if ($login::userIsAtLeast($roles::$editor))
+
+
+ @endif
+
+
+ + Goal: + + {{ $tpl->e($row["title"]) }} + +
++ Metric: {{ $tpl->escape($row["description"]) }} +
+ + @php + $percentDone = $row["goalProgress"]; + $metricTypeFront = ''; + $metricTypeBack = ''; + if ($row["metricType"] == "percent") { + $metricTypeBack = '%'; + } elseif ($row["metricType"] == "currency") { + $metricTypeFront = __("language.currency"); + } + @endphp + +
+
+
+
+ {{ sprintf(__("text.percent_complete"), $percentDone) }}
+
+
+
+
+
+
+
+
+
+
+ @if (!empty($statusLabels))
+
+ @endif
+
+ @if (!empty($relatesLabels))
+
+ @endif
+
+
+ Start:
{{ $metricTypeFront . $row["startValue"] . $metricTypeBack }} +
+ {{ $metricTypeFront . $row["startValue"] . $metricTypeBack }} +
+ {{ __('label.current') }}:
{{ $metricTypeFront . $row["currentValue"] . $metricTypeBack }} +
+ {{ $metricTypeFront . $row["currentValue"] . $metricTypeBack }} +
+ {{ __('label.goal') }}:
{{ $metricTypeFront . $row["endValue"] . $metricTypeBack }} +
+ {{ $metricTypeFront . $row["endValue"] . $metricTypeBack }} +
+
+
+ @if ($row["authorFirstname"] != "")
+
+ 
+
+
+ @else
+
+ 
+
+
+ @endif
+
+
+
+
+ -
+
+ @foreach ($tpl->get('users') as $user)
+
-
+
+
+ {{ sprintf(__("text.full_name"), $tpl->escape($user["firstname"]), $tpl->escape($user['lastname'])) }} + +
+ @endforeach
+
+
+
+
+ {{ $nbcomments }}
+
+ +
+
+ @endif
+
+ {{ __("label.loading_milestone") }}
+
+ +
-
-
-
-
-
- e(session("currentProjectClient") . " // " . session("currentProjectName")); ?>
- -__("headline.$canvasName.dashboardboard") ?> // - 0) {?> - - All Goal Groups - - - - - - -
-
-
-
-displayNotification(); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- get('allCanvas')) > 0) { ?>
-
-
-
-
-
-
-
-
-
-
-
- Progress: %
- -
-
-
-
-
-
-
-
-
- On Track
- -
-
-
-
- At Risk
- -
-
-
-
-
- Miss
- - -
-
-
-
-
-
-
-
-
-
-
-
- 0) {?>
- get('allCanvas') as $canvasRow) { ?>
-
-
-
-
-
-
-
- Create New Goal
-
- " . $tpl->escape($canvasRow["title"]) . " "; ?>
-
-
-
- make(Goalcanvas::class);
- $canvasItems = $canvasSvc->getCanvasItemsById($canvasRow["id"]);
- ?>
-
-
- " class="sortableTicketList disabled col-md-12" style="padding-top:15px;">
-
-
-
- - - -
-
-
-
-
- No goals on this board yet. Open the board to start adding goals
";
- }
- ?>
- make(Comments::class);
- $nbcomments = $comments->countComments(moduleId: $row['id']);
- ?>
-
-
-
-
-
-
-
- ">
-
-
-
-
-
-
-
-
- Metric: escape($row["description"]) ?> -
- - __("language.currency"); - } - ?> - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Goal: - " - class="CanvasModal" - data="item_"> - e($row["title"]);?> - -
-- Metric: escape($row["description"]) ?> -
- - __("language.currency"); - } - ?> - -
-
-
-
-
- __("text.percent_complete"), $percentDone); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Start:
-
- -
- __('label.current') ?>:
-
- -
- __('label.goal') ?>:
-
- -
-
-
-
-
-
-
-
-
-
-
-
- >
-
-
- -
-
-
-
- __("label.loading_milestone") ?>
-
- - - - -
-
- 0) { ?>
- __('links.add_new_canvas_item' . $canvasName) ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0 && !empty($statusLabels)) {?>
-
-
-
-
-
-
-
-
-
-
- 0 && !empty($relatesLabels)) {?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - -
-
- make(\Leantime\Domain\Comments\Repositories\Comments::class);
- $nbcomments = $comments->countComments(moduleId: $row['id']);
- ?>
-
-
-
-
-
-
- ">
-
-
-
-
-
-
-
-
- escape($row["assumptions"]) ?> -
- - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- " - class="CanvasModal" - data="item_">e($row["description"]);?>
-- escape($row["assumptions"]) ?> -
- - - - -
-
-
-
- __('label.current') ?>:
-
-
- __("text.percent_complete"), $percentDone); ?>
-
-
- __('label.goal') ?>:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- " .
- "![](" . BASE_URL . "/api/users?profileImage=" . $row[)
";
- } else {
- echo "![](" . BASE_URL .
- "/api/users?profileImage=false)
";
- } ?>
-
-
-
-
- -
-
- get('users') as $user) {
- echo "
- " .
- "
" . - sprintf( - $tpl->__("text.full_name"), - $tpl->escape($user["firstname"]), - $tpl->escape($user['lastname']) - ) . ""; - echo"
";
- }?>
-
- >
-
-
- -
-
-
- 60 ?
- $tpl->e(substr(($row['milestoneHeadline']), 0, 60) . " ...") : $tpl->e($row['milestoneHeadline']); ?>
-
-
- __("text.percent_complete"), $row['percentDone'])?>
-
-
-
-
-
-
-
-
-
- - - - -
";
-
- echo "
" . $tpl->__("text.goal.helper_content"); - - - echo"
";
- } ?>
-
-
-
-
-
- */
-
-echo $tpl->viewFactory->make(
- $tpl->getTemplatePath('canvas', 'showCanvasBottom'),
- array_merge($__data, ['canvasName' => 'goal'])
-)->render(); ?>
diff --git a/app/Domain/Goalcanvas/Templates/delCanvas.blade.php b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
new file mode 100644
index 0000000000..47bc018b79
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
@@ -0,0 +1,29 @@
+@extends($layout)
+@section('content')
+
+
+@php
+/**
+ * delCanvas.inc template - Generic template for deleting canvas
+ *
+ * Required variables:
+ * - $canvasName Name of current canvas
+ * - $csrf_token CSRF token (if used in your application)
+ */
+
+$id = filter_var($_GET['id'] ?? '', FILTER_SANITIZE_NUMBER_INT);
+$canvasName = 'goal'
+@endphp
+
+";
- echo file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg");
- echo "
";
-
- echo"" . $tpl->__("headlines.goal.analysis") . "
"; - echo "" . $tpl->__("text.goal.helper_content"); - - - echo"
{{ __("subtitles.delete") }}
+ + + +@endsection \ No newline at end of file diff --git a/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php b/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php deleted file mode 100644 index 608a99bf40..0000000000 --- a/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php +++ /dev/null @@ -1,13 +0,0 @@ - $val) { - $$var = $val; // necessary for blade refactor -} -echo $tpl->viewFactory->make( - $tpl->getTemplatePath('canvas', 'delCanvas'), - array_merge($__data, ['canvasName' => 'goal']) -)->render(); diff --git a/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php new file mode 100644 index 0000000000..a6908c91d5 --- /dev/null +++ b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php @@ -0,0 +1,25 @@ +@extends($layout) +@section('content') + +@php + +/** + * delCanvasItem.inc template - Generic template for deleting canvas item + * + * Required variables: + * - $canvasName Name of current canvas + */ + +$id = filter_var($_GET['id'], FILTER_SANITIZE_NUMBER_INT); +$canvasName = 'goal' +@endphp + +__("subtitles.delete") ?>
++ + +@endsection diff --git a/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php b/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php deleted file mode 100644 index 155d8a1b4c..0000000000 --- a/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php +++ /dev/null @@ -1,13 +0,0 @@ - $val) { - $$var = $val; // necessary for blade refactor -} -echo $tpl->viewFactory->make( - $tpl->getTemplatePath('canvas', 'delCanvasItem'), - array_merge($__data, ['canvasName' => 'goal']) -)->render(); diff --git a/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php new file mode 100644 index 0000000000..8f044e7e10 --- /dev/null +++ b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php @@ -0,0 +1,67 @@ +@if (count($tpl->get('allCanvas')) > 0) +@else +
+
+
{{ __("text.$canvasName.helper_content") }} + + @if ($login::userIsAtLeast($roles::$editor)) +
+ + {{ __("links.icon.create_new_board") }} + + @endif +
+@endif
+
+@if (!empty($disclaimer) && count($tpl->get('allCanvas')) > 0)
+{{ $disclaimer }}
+@endif
+
+{!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
+
+ {!! file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg") !!}
+
+
+ {{ __("headlines.$canvasName.analysis") }}
+{{ __("text.$canvasName.helper_content") }} + + @if ($login::userIsAtLeast($roles::$editor)) +
+ + {{ __("links.icon.create_new_board") }} + + @endif +