Skip to content

Commit

Permalink
Misc template enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelfolaron
marcelfolaron committed Aug 23, 2024
1 parent d58e164 commit 73ad52c
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 116 deletions.
19 changes: 10 additions & 9 deletions app/Domain/Goalcanvas/Templates/canvasComment.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,25 @@
$tpl->displaySubmodule('comments-generalComment');
@endphp
@endif

</div>


<script type="text/javascript">
jQuery(document).ready(function() {
jQuery(document).ready(function() {
leantime.editorController.initSimpleEditor();
leantime.editorController.initSimpleEditor();
@if(!$login::userIsAtLeast($roles::$editor))
leantime.authController.makeInputReadonly(".nyroModalCont");
@if(!$login::userIsAtLeast($roles::$editor))
leantime.authController.makeInputReadonly(".nyroModalCont");
@endif;
@endif;
@if($login::userHasRole([$roles::$commenter]))
leantime.commentsController.enableCommenterForms();
@endif;
@if($login::userHasRole([$roles::$commenter]))
leantime.commentsController.enableCommenterForms();
@endif;
})
})
</script>

@endsection
282 changes: 178 additions & 104 deletions app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<h1><i class="fas {{ $canvasTypes[$canvasItem['box']]['icon'] }}"></i>
{{ $canvasTypes[$canvasItem['box']]['title'] }}</h1>


<form class="formModal" method="post" action="{{ BASE_URL . "/goalcanvas/editCanvasItem/$id" }}">

<input type="hidden" value="{{ $currentCanvas }}" name="canvasId">
Expand All @@ -23,88 +22,163 @@
<input type="hidden" name="milestoneId" value="{{ $canvasItem['milestoneId'] ?? '' }}">
<input type="hidden" name="changeItem" value="1">

<div class="col-md-8">
<label>{{ __('label.what_is_your_goal') }}</label>
<input type="text" name="title" value="{{ $canvasItem['title'] }}" style="width:100%"><br>

@if (!empty($relatesLabels))
<label>{{ __('label.relates') }}</label>
<select name="relates" style="width: 50%" id="relatesCanvas">
</select><br>
@else
<input type="hidden" name="relates"
value="{{ $canvasItem['relates'] ?? array_key_first($hiddenRelatesLabels) }}">
@endif
<br>
<h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-ranking-star"></i>
{{ __('Metrics') }}</h4>

@dispatchEvent('beforeMeasureGoalContainer', $canvasItem)
<div id="measureGoalContainer">
<label>{{ __('text.what_metric_will_you_be_using') }}</label>
<input type="text" name="description" value="{{ $canvasItem['description'] }}"
style="width:100%"><br>
</div>

<div class="row">
<div class="col-md-3">
<label>{{ __('label.starting_value') }}</label>
<input type="number" step="0.01" name="startValue" value="{{ $canvasItem['startValue'] }}"
style="width:105px">
</div>
<div class="col-md-3">
<label>{{ __('label.current_value') }}</label>
<input type="number" step="0.01" name="currentValue" id="currentValueField"
value="{{ $canvasItem['currentValue'] }}"
@if ($canvasItem['setting'] == 'linkAndReport') readonly data-tippy-content="Current value calculated from child goals" @endif
style="width:105px">
</div>
<div class="col-md-3">
<label>{{ __('label.goal_value') }}</label>
<input type="number" step="0.01" name="endValue" value="{{ $canvasItem['endValue'] }}"
style="width:105px">
<div class="row">
<div class="col-md-8">
<label>{{ __('label.what_is_your_goal') }}</label>
<input type="text" name="title" value="{{ $canvasItem['title'] }}" style="width:100%"><br>

@if (!empty($relatesLabels))
<label>{{ __('label.relates') }}</label>
<select name="relates" style="width: 50%" id="relatesCanvas">
</select><br>
@else
<input type="hidden" name="relates"
value="{{ $canvasItem['relates'] ?? array_key_first($hiddenRelatesLabels) }}">
@endif
<br>
<h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-ranking-star"></i>
{{ __('Metrics') }}</h4>

@dispatchEvent('beforeMeasureGoalContainer', $canvasItem)
<div id="measureGoalContainer">
<label>{{ __('text.what_metric_will_you_be_using') }}</label>
<input type="text" name="description" value="{{ $canvasItem['description'] }}"
style="width:100%"><br>
</div>
<div class="col-md-3">
<label>{{ __('label.type') }}</label>
<select name="metricType">
<option value="number" @if ($canvasItem['metricType'] == 'number') selected @endif>
{{ __('label.number') }}</option>
<option value="percent" @if ($canvasItem['metricType'] == 'percent') selected @endif>
{{ __('label.percent') }}</option>
<option value="currency" @if ($canvasItem['metricType'] == 'currency') selected @endif>
{{ __('language.currency') }}</option>
</select>

<div class="row">
<div class="col-md-3">
<label>{{ __('label.starting_value') }}</label>
<input type="number" step="0.01" name="startValue" value="{{ $canvasItem['startValue'] }}"
style="width:105px">
</div>
<div class="col-md-3">
<label>{{ __('label.current_value') }}</label>
<input type="number" step="0.01" name="currentValue" id="currentValueField"
value="{{ $canvasItem['currentValue'] }}"
@if ($canvasItem['setting'] == 'linkAndReport') readonly data-tippy-content="Current value calculated from child goals" @endif
style="width:105px">
</div>
<div class="col-md-3">
<label>{{ __('label.goal_value') }}</label>
<input type="number" step="0.01" name="endValue" value="{{ $canvasItem['endValue'] }}"
style="width:105px">
</div>
<div class="col-md-3">
<label>{{ __('label.type') }}</label>
<select name="metricType">
<option value="number" @if ($canvasItem['metricType'] == 'number') selected @endif>
{{ __('label.number') }}</option>
<option value="percent" @if ($canvasItem['metricType'] == 'percent') selected @endif>
{{ __('label.percent') }}</option>
<option value="currency" @if ($canvasItem['metricType'] == 'currency') selected @endif>
{{ __('language.currency') }}</option>
</select>
</div>
</div>

<br>
@if ($login::userIsAtLeast($roles::$editor))
<input type="submit" value="{{ __('buttons.save') }}" id="primaryCanvasSubmitButton">
<button type="submit" class="btn btn-primary" id="saveAndClose" value="closeModal"
onclick="leantime.goalCanvasController.setCloseModal();">{{ __('buttons.save_and_close') }}</button>
@endif

@if ($id !== '')
<br /><br /><br />
<input type="hidden" name="comment" value="1" />
<h4 class="widgettitle title-light"><span
class="fa fa-comments"></span>{{ __('subtitles.discussion') }}</h4>
@php
$tpl->assign('formUrl', '/goalcanvas/editCanvasItem/' . $id . '');
$tpl->displaySubmodule('comments-generalComment');
@endphp
@endif
</div>

<br>
@if ($login::userIsAtLeast($roles::$editor))
<input type="submit" value="{{ __('buttons.save') }}" id="primaryCanvasSubmitButton">
<button type="submit" class="btn btn-primary" id="saveAndClose" value="closeModal"
onclick="leantime.goalCanvasController.setCloseModal();">{{ __('buttons.save_and_close') }}</button>
@endif

@if ($id !== '')
<br /><br /><br />
<input type="hidden" name="comment" value="1" />
<h4 class="widgettitle title-light"><span
class="fa fa-comments"></span>{{ $tpl->__('subtitles.discussion') }}</h4>
@php
$tpl->assign('formUrl', '/goalcanvas/editCanvasItem/' . $id . '');
$tpl->displaySubmodule('comments-generalComment');
@endphp
@endif
<div class="col-md-4">
@if (!empty($statusLabels))
<label>{{ __("label.status") }}</label>
<select name="status" style="width: 50%" id="statusCanvas">
</select><br /><br />
@else
<input type="hidden" name="status" value="{{ $canvasItem['status'] ?? array_key_first($hiddenStatusLabels) }}" />
@endif

<h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-calendar"></i> {{ __('label.dates') }}</h4>

<label>{{ __('label.start_date') }}</label>
<input type="text" autocomplete="off" value="{{ format($canvasItem['startDate'])->date() }}" name="startDate" class="startDate"/>

<label>{{ __('label.end_date') }}</label>
<input type="text" autocomplete="off" value="{{ format($canvasItem['endDate'])->date() }}" name="endDate" class="endDate"/>

@if ($id !== '')
<br /><br />
<h4 class="widgettitle title-light"><span class="fa fa-link"></span> {{ __("headlines.linked_milestone") }} <i class="fa fa-question-circle-o helperTooltip" data-tippy-content="{{ __("tooltip.link_milestones_tooltip") }}"></i></h4>

@if ($canvasItem['milestoneId'] == '')
<center>
<h4>{{ __("headlines.no_milestone_link") }}</h4>
<div class="row" id="milestoneSelectors">
@if ($login::userIsAtLeast($roles::$editor))
<div class="col-md-12">
<a href="javascript:void(0);" onclick="leantime.goalCanvasController.toggleMilestoneSelectors('new');">{{ __("links.create_link_milestone") }}</a>
@if (count($tpl->get('milestones')) > 0)
| <a href="javascript:void(0);" onclick="leantime.goalCanvasController.toggleMilestoneSelectors('existing');">{{ __("links.link_existing_milestone") }}</a>
@endif
</div>
@endif
</div>
<div class="row" id="newMilestone" style="display:none;">
<div class="col-md-12">
<input type="text" width="50%" name="newMilestone"></textarea><br />
<input type="hidden" name="type" value="milestone" />
<input type="hidden" name="goalcanvasitemid" value="{{ $id }}" />
<input type="button" value="{{ __("buttons.save") }}" onclick="jQuery('#primaryCanvasSubmitButton').click()" class="btn btn-primary" />
<input type="button" value="{{ __("buttons.cancel") }}" onclick="leantime.goalCanvasController.toggleMilestoneSelectors('hide')" class="btn btn-primary" />
</div>
</div>

<div class="row" id="existingMilestone" style="display:none;">
<div class="col-md-12">
<select data-placeholder="{{ __("input.placeholders.filter_by_milestone") }}" name="existingMilestone" class="user-select">
<option value=""></option>
@foreach ($tpl->get('milestones') as $milestoneRow)
<option value="{{ $milestoneRow->id }}" {{ isset($searchCriteria['milestone']) && ($searchCriteria['milestone'] == $milestoneRow->id) ? 'selected' : '' }}>
{{ $milestoneRow->headline }}
</option>
@endforeach
</select>
<input type="hidden" name="type" value="milestone" />
<input type="hidden" name="goalcanvasitemid" value="{{ $id }}" />
<input type="button" value="{{ __("buttons.save") }}" onclick="jQuery('#primaryCanvasSubmitButton').click()" class="btn btn-primary" />
<input type="button" value="{{ __("buttons.cancel") }}" onclick="leantime.goalCanvasController.toggleMilestoneSelectors('hide')" class="btn btn-primary" />
</div>
</div>
</center>
@else
<div hx-trigger="load"
hx-indicator=".htmx-indicator"
hx-get="{{ BASE_URL }}/hx/tickets/milestones/showCard?milestoneId={{ $canvasItem['milestoneId'] }}">
<div class="htmx-indicator">
{{ __("label.loading_milestone") }}
</div>
</div>
<a href="{{ BASE_URL }}/goalcanvas/editCanvasItem/{{ $id }}?removeMilestone={{ $canvasItem['milestoneId'] }}" class="goalCanvasModal delete formModal"><i class="fa fa-close"></i> {{ __("links.remove") }}</a>
@endif
@endif
</div>
</div>

@if ($id != '')
<a href="{{ BASE_URL . "goalcanvas/delCanvasItem/$id" }}" class="formModal delete right">
<a href="{{ BASE_URL . "/goalcanvas/delCanvasItem/$id" }}" class="formModal delete right">
<i class='fa fa-trash-can'></i> {{ __('links.delete') }}
</a>
@endif

</form>


</div>

<script type="text/javascript">
Expand All @@ -113,53 +187,53 @@ class="fa fa-comments"></span>{{ $tpl->__('subtitles.discussion') }}</h4>
leantime.dateController.initDateRangePicker(".startDate", ".endDate");
@if (!empty($statusLabels))
new SlimSelect({
select: '#statusCanvas',
showSearch: false,
valuesUseText: false,
data: [
new SlimSelect({
select: '#statusCanvas',
showSearch: false,
valuesUseText: false,
data: [
@foreach ($statusLabels as $key => $data)
@if ($data['active'])
{
innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
text: "{{ $data['title'] }}",
value: "{{ $key }}",
selected: {{ $canvasItem['status'] == $key ? 'true' : 'false' }}
},
@endif
@endforeach
]
});
@if ($data['active'])
{
innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
text: "{{ $data['title'] }}",
value: "{{ $key }}",
selected: {{ $canvasItem['status'] == $key ? 'true' : 'false' }}
},
@endif
@endforeach
]
});
@endif
@if (!empty($relatesLabels))
new SlimSelect({
select: '#relatesCanvas',
showSearch: false,
valuesUseText: false,
data: [
new SlimSelect({
select: '#relatesCanvas',
showSearch: false,
valuesUseText: false,
data: [
@foreach ($relatesLabels as $key => $data)
@if ($data['active'])
{
innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
text: "{{ $data['title'] }}",
value: "{{ $key }}",
selected: {{ $canvasItem['relates'] == $key ? 'true' : 'false' }}
},
@endif
@endforeach
]
});
@if ($data['active'])
{
innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
text: "{{ $data['title'] }}",
value: "{{ $key }}",
selected: {{ $canvasItem['relates'] == $key ? 'true' : 'false' }}
},
@endif
@endforeach
]
});
@endif
leantime.editorController.initSimpleEditor();
@if (!$login::userIsAtLeast($roles::$editor))
leantime.authController.makeInputReadonly(".nyroModalCont");
leantime.authController.makeInputReadonly(".nyroModalCont");
@endif
@if ($login::userHasRole([$roles::$commenter]))
leantime.commentsController.enableCommenterForms();
leantime.commentsController.enableCommenterForms();
@endif
});
Expand Down
Loading

0 comments on commit 73ad52c

Please sign in to comment.