diff --git a/.changeset/empty-walls-tap.md b/.changeset/empty-walls-tap.md new file mode 100644 index 000000000..a23cccb19 --- /dev/null +++ b/.changeset/empty-walls-tap.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': patch +--- + +Apply Prettier to the codebase diff --git a/.prettierignore b/.prettierignore index 4178fd571..f4cef85e8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -23,3 +23,15 @@ /package.json.ember-try /package-lock.json.ember-try /yarn.lock.ember-try + +# CI/CD +.changeset/ +.github/ +.woodpecker/ +pnpm-lock.yaml + +# Docs +*.md + +# E2E HTML +e2e/files/*.html diff --git a/.prettierrc.js b/.prettierrc.js index e5f7b6d1e..534e6d35a 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,12 +1,5 @@ 'use strict'; module.exports = { - overrides: [ - { - files: '*.{js,ts}', - options: { - singleQuote: true, - }, - }, - ], + singleQuote: true, }; diff --git a/.release-it.json b/.release-it.json index d670af4a3..e13bd4adb 100644 --- a/.release-it.json +++ b/.release-it.json @@ -10,4 +10,4 @@ "ignoreVersion": true, "allowSameVersion": true } -} \ No newline at end of file +} diff --git a/.woodpecker/.test-pr.yml b/.woodpecker/.test-pr.yml index 8dc866788..efd1f885f 100644 --- a/.woodpecker/.test-pr.yml +++ b/.woodpecker/.test-pr.yml @@ -3,11 +3,21 @@ steps: image: danlynn/ember-cli:4.12.1 commands: - npm ci - lint: - image: danlynn/ember-cli:4.12.1 + lint-js: + image: node:20-slim + group: lint + commands: + - npm run lint:js + lint-hbs: + image: node:20-slim + group: lint + commands: + - npm run lint:hbs + lint-prettier: + image: node:20-slim group: lint commands: - - npm run lint + - npm run lint:prettier dependency-lint: image: danlynn/ember-cli:4.12.1 group: lint diff --git a/app/components/administrative-body-select.hbs b/app/components/administrative-body-select.hbs index 39a0fd355..a0e4a83c5 100644 --- a/app/components/administrative-body-select.hbs +++ b/app/components/administrative-body-select.hbs @@ -1,6 +1,6 @@ -
+
{{administrativeBody.isTijdsspecialisatieVan.naam}} - ({{t "administrative-body-select.period"}}: {{plain-date administrativeBody.bindingStart}} - + ({{t 'administrative-body-select.period'}}: + {{plain-date administrativeBody.bindingStart}} + - {{#if administrativeBody.bindingEinde~}} {{plain-date administrativeBody.bindingEinde}} {{else}} - {{t "administrative-body-select.not-applicable"}} + {{t 'administrative-body-select.not-applicable'}} {{/if}}) -
+
\ No newline at end of file diff --git a/app/components/agenda-manager/agenda-context.hbs b/app/components/agenda-manager/agenda-context.hbs index ccdb71fe8..e7f77ae1d 100644 --- a/app/components/agenda-manager/agenda-context.hbs +++ b/app/components/agenda-manager/agenda-context.hbs @@ -1,9 +1,11 @@ -{{yield (hash - items=this.items - loadItemsTask=this.loadItemsTask - deleteItemTask=this.deleteItemTask - onSort=(perform this.onSortTask) - saveItemTask=this.updateItemTask - createAgendaItem=this.createAgendaItem - onCancel=(perform this.resetItemTask) -)}} \ No newline at end of file +{{yield + (hash + items=this.items + loadItemsTask=this.loadItemsTask + deleteItemTask=this.deleteItemTask + onSort=(perform this.onSortTask) + saveItemTask=this.updateItemTask + createAgendaItem=this.createAgendaItem + onCancel=(perform this.resetItemTask) + ) +}} \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/index.hbs b/app/components/agenda-manager/agenda-item-form/index.hbs index f6266e4aa..689c276c8 100644 --- a/app/components/agenda-manager/agenda-item-form/index.hbs +++ b/app/components/agenda-manager/agenda-item-form/index.hbs @@ -1,7 +1,19 @@ -{{yield (hash - Textarea=(component "agenda-manager/agenda-item-form/text-area" model=@model) - Radio=(component "agenda-manager/agenda-item-form/radio" model=@model) - Submit=(component "agenda-manager/agenda-item-form/submit" submit=this.submit loading=this.submitTask.isRunning) - SelectDraft=(component "agenda-manager/agenda-item-form/select-draft" model=@model) - SelectLocation=(component "agenda-manager/agenda-item-form/select-location" model=@model) -)}} +{{yield + (hash + Textarea=(component + 'agenda-manager/agenda-item-form/text-area' model=@model + ) + Radio=(component 'agenda-manager/agenda-item-form/radio' model=@model) + Submit=(component + 'agenda-manager/agenda-item-form/submit' + submit=this.submit + loading=this.submitTask.isRunning + ) + SelectDraft=(component + 'agenda-manager/agenda-item-form/select-draft' model=@model + ) + SelectLocation=(component + 'agenda-manager/agenda-item-form/select-location' model=@model + ) + ) +}} \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/radio/index.hbs b/app/components/agenda-manager/agenda-item-form/radio/index.hbs index 77f0472e5..1d56198ce 100644 --- a/app/components/agenda-manager/agenda-item-form/radio/index.hbs +++ b/app/components/agenda-manager/agenda-item-form/radio/index.hbs @@ -1,5 +1,10 @@ -{{yield (hash Option=(component "agenda-manager/agenda-item-form/radio/option" - selectedOption=this.selectedOption - selectOption=this.selectOption - name=@name)) -}} +{{yield + (hash + Option=(component + 'agenda-manager/agenda-item-form/radio/option' + selectedOption=this.selectedOption + selectOption=this.selectOption + name=@name + ) + ) +}} \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/radio/option.hbs b/app/components/agenda-manager/agenda-item-form/radio/option.hbs index 8ed46b91c..53b154aa5 100644 --- a/app/components/agenda-manager/agenda-item-form/radio/option.hbs +++ b/app/components/agenda-manager/agenda-item-form/radio/option.hbs @@ -1,7 +1,12 @@ - \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/select-draft.hbs b/app/components/agenda-manager/agenda-item-form/select-draft.hbs index b9dec6189..c1e15566c 100644 --- a/app/components/agenda-manager/agenda-item-form/select-draft.hbs +++ b/app/components/agenda-manager/agenda-item-form/select-draft.hbs @@ -6,13 +6,14 @@ @renderInPlace={{true}} @placeholder={{@placeholder}} @options={{this.options}} - @verticalPosition="below" + @verticalPosition='below' @searchEnabled={{true}} @selected={{this.selected}} @allowClear={{true}} @search={{perform this.getDrafts}} @onChange={{this.select}} - as |option|> + as |option| + > {{option.currentVersion.title}} - + \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/select-location.hbs b/app/components/agenda-manager/agenda-item-form/select-location.hbs index 8fea7e3f0..1f0c06937 100644 --- a/app/components/agenda-manager/agenda-item-form/select-location.hbs +++ b/app/components/agenda-manager/agenda-item-form/select-location.hbs @@ -1,37 +1,46 @@ -
+
{{yield}} -
-
+
+
+ as |location| + > {{location.name}}
{{#if this.showAfterItemOptions}} -
+
- {{add a.position 1}}. {{a.titel}} + as |a| + > + {{add a.position 1}}. + {{a.titel}}
{{/if}}
-
+
\ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/submit.hbs b/app/components/agenda-manager/agenda-item-form/submit.hbs index e2401498c..4a88b2e87 100644 --- a/app/components/agenda-manager/agenda-item-form/submit.hbs +++ b/app/components/agenda-manager/agenda-item-form/submit.hbs @@ -1,3 +1,3 @@ - + {{yield}} - + \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-item-form/text-area.hbs b/app/components/agenda-manager/agenda-item-form/text-area.hbs index 8bc048bd2..9b0565f96 100644 --- a/app/components/agenda-manager/agenda-item-form/text-area.hbs +++ b/app/components/agenda-manager/agenda-item-form/text-area.hbs @@ -3,7 +3,7 @@

\ No newline at end of file diff --git a/app/components/agenda-manager/agenda-table/body.hbs b/app/components/agenda-manager/agenda-table/body.hbs index a87ba08d1..fb5c8647e 100644 --- a/app/components/agenda-manager/agenda-table/body.hbs +++ b/app/components/agenda-manager/agenda-table/body.hbs @@ -1,11 +1,15 @@ - - {{yield (hash - Row=(component "agenda-manager/agenda-table/row" readOnly=@readOnly) - Empty=(component "agenda-manager/agenda-table/empty" onCreate=@onCreate) - )}} + + {{yield + (hash + Row=(component 'agenda-manager/agenda-table/row' readOnly=@readOnly) + Empty=(component 'agenda-manager/agenda-table/empty' onCreate=@onCreate) + ) + }} \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-table/empty.hbs b/app/components/agenda-manager/agenda-table/empty.hbs index a31472ba5..85e38c543 100644 --- a/app/components/agenda-manager/agenda-table/empty.hbs +++ b/app/components/agenda-manager/agenda-table/empty.hbs @@ -1,7 +1,7 @@ - - - {{t "manage-agenda-zitting-modal.no-data-message"}} + + + {{t 'manage-agenda-zitting-modal.no-data-message'}} \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-table/header.hbs b/app/components/agenda-manager/agenda-table/header.hbs index 330e260d1..2de4a1ceb 100644 --- a/app/components/agenda-manager/agenda-table/header.hbs +++ b/app/components/agenda-manager/agenda-table/header.hbs @@ -1,16 +1,20 @@ - {{t "manage-agenda-zitting-modal.order-label"}} + {{t 'manage-agenda-zitting-modal.order-label'}} {{!template-lint-disable no-inline-styles}} - {{t "manage-agenda-zitting-modal.title-label"}} - {{t "manage-agenda-zitting-modal.gepland-openbaar"}} - - {{t "manage-agenda-zitting-modal.actions-label"}} + {{t + 'manage-agenda-zitting-modal.title-label' + }} + {{t 'manage-agenda-zitting-modal.gepland-openbaar'}} + + {{t + 'manage-agenda-zitting-modal.actions-label' + }} {{#unless @readOnly}} - - {{t "manage-agenda-zitting-modal.create-item-button"}} + + {{t 'manage-agenda-zitting-modal.create-item-button'}} {{/unless}} - + \ No newline at end of file diff --git a/app/components/agenda-manager/agenda-table/index.hbs b/app/components/agenda-manager/agenda-table/index.hbs index 2ace45a7d..ca7e7bbc6 100644 --- a/app/components/agenda-manager/agenda-table/index.hbs +++ b/app/components/agenda-manager/agenda-table/index.hbs @@ -1,6 +1,18 @@ - - {{yield (hash - Header=(component "agenda-manager/agenda-table/header" onCreate=@onCreate readOnly=@readOnly) - Body=(component "agenda-manager/agenda-table/body" items=@items onSort=@onSort onCreate=@onCreate readOnly=@readOnly) - )}} -
+ + {{yield + (hash + Header=(component + 'agenda-manager/agenda-table/header' + onCreate=@onCreate + readOnly=@readOnly + ) + Body=(component + 'agenda-manager/agenda-table/body' + items=@items + onSort=@onSort + onCreate=@onCreate + readOnly=@readOnly + ) + ) + }} +
\ No newline at end of file diff --git a/app/components/agenda-manager/agenda-table/row.hbs b/app/components/agenda-manager/agenda-table/row.hbs index d1b8c624c..e06561803 100644 --- a/app/components/agenda-manager/agenda-table/row.hbs +++ b/app/components/agenda-manager/agenda-table/row.hbs @@ -7,32 +7,48 @@

{{limit-content @item.titel 40}}

- {{if @item.geplandOpenbaar (t "manage-agenda-zitting-modal.gepland-openbaar-true-label") - (t "manage-agenda-zitting-modal.gepland-openbaar-false-label")}} + {{if + @item.geplandOpenbaar + (t 'manage-agenda-zitting-modal.gepland-openbaar-true-label') + (t 'manage-agenda-zitting-modal.gepland-openbaar-false-label') + }} - + {{#if this.published}} - - {{t "manage-agenda-zitting-modal.ap-published-msg"}} + + {{t 'manage-agenda-zitting-modal.ap-published-msg'}} {{/if}} {{else}} - + - +

{{limit-content @item.titel 40}}

- {{if @item.geplandOpenbaar (t "manage-agenda-zitting-modal.gepland-openbaar-true-label") - (t "manage-agenda-zitting-modal.gepland-openbaar-false-label")}} - - - - {{t "manage-agenda-zitting-modal.edit-item-button"}} + {{if + @item.geplandOpenbaar + (t 'manage-agenda-zitting-modal.gepland-openbaar-true-label') + (t 'manage-agenda-zitting-modal.gepland-openbaar-false-label') + }} + + + + {{t 'manage-agenda-zitting-modal.edit-item-button'}} diff --git a/app/components/agenda-manager/edit.hbs b/app/components/agenda-manager/edit.hbs index 87f0557e9..937a57c70 100644 --- a/app/components/agenda-manager/edit.hbs +++ b/app/components/agenda-manager/edit.hbs @@ -1,59 +1,79 @@ - + {{#if this.isSubmitting}} - {{t "participation-list.loading-loader"}} + {{t 'participation-list.loading-loader'}} {{else}} {{!-- {{t "manage-agenda-zitting-modal-edit.modal-subtitle"}} --}} -
+
{{#if this.isNew}} - - {{t "manage-agenda-zitting-modal-draft-import.title"}} + + {{t 'manage-agenda-zitting-modal-draft-import.title'}} {{/if}} - - {{t "manage-agenda-zitting-modal.title-label"}} + + {{t 'manage-agenda-zitting-modal.title-label'}} - - {{t "manage-agenda-zitting-modal.beschrijving-label"}} + + {{t 'manage-agenda-zitting-modal.beschrijving-label'}} - {{#if @itemToEdit.behandeling.documentContainer.currentVersion.content}} - {{t "manage-agenda-zitting-modal.copy-description-label"}} + {{#if + @itemToEdit.behandeling.documentContainer.currentVersion.content + }} + {{t + 'manage-agenda-zitting-modal.copy-description-label' + }} {{/if}}
- {{t "manage-agenda-zitting-modal.gepland-openbaar"}} + {{t 'manage-agenda-zitting-modal.gepland-openbaar'}} -
- - - {{t "manage-agenda-zitting-modal-edit.gepland-openbaar-true-label"}} +
+ + + {{t + 'manage-agenda-zitting-modal-edit.gepland-openbaar-true-label' + }} - - {{t "manage-agenda-zitting-modal-edit.gepland-openbaar-false-label"}} + + {{t + 'manage-agenda-zitting-modal-edit.gepland-openbaar-false-label' + }}
{{#if (gt @agendaItems.length 0)}} - - {{t "manage-agenda-zitting-modal-move.title"}} + + {{t 'manage-agenda-zitting-modal-move.title'}} {{/if}}
@@ -61,25 +81,32 @@ - - {{t "manage-agenda-zitting-modal.cancel-button"}} - + + {{t 'manage-agenda-zitting-modal.cancel-button'}} + {{#unless this.isNew}} - - {{t "manage-agenda-zitting-modal-delete.delete-button"}} - + + {{t 'manage-agenda-zitting-modal-delete.delete-button'}} + {{/unless}} - {{t "manage-agenda-zitting-modal.save-button"}} + {{t + 'manage-agenda-zitting-modal.save-button' + }} - + \ No newline at end of file diff --git a/app/components/agenda-manager/index.hbs b/app/components/agenda-manager/index.hbs index 38bef517d..192c6d94c 100644 --- a/app/components/agenda-manager/index.hbs +++ b/app/components/agenda-manager/index.hbs @@ -5,24 +5,25 @@ @onCancel={{this.stopEditing}} as |agenda| > -
+
{{#if agenda.loadItemsTask.isRunning}} - {{t "participation-list.loading-loader"}} + {{t 'participation-list.loading-loader'}} {{else}} - + @onSort={{agenda.onSort}} + @onCreate={{agenda.createAgendaItem}} + @items={{agenda.items}} + @readOnly={{@readOnly}} + as |Table| + > + {{#each agenda.items as |item|}} {{else}} - + {{/each}} diff --git a/app/components/agenda-punt-link.hbs b/app/components/agenda-punt-link.hbs index 9c5dece2f..315b5e89c 100644 --- a/app/components/agenda-punt-link.hbs +++ b/app/components/agenda-punt-link.hbs @@ -1,5 +1,13 @@ -{{#if (or (eq this.editorStatus "published") @readOnly)}} - {{limit-content @documentContainer.currentVersion.title 70}} +{{#if (or (eq this.editorStatus 'published') @readOnly)}} + {{limit-content @documentContainer.currentVersion.title 70}} {{else}} - {{limit-content @documentContainer.currentVersion.title 70}} + {{limit-content @documentContainer.currentVersion.title 70}} {{/if}} \ No newline at end of file diff --git a/app/components/agendapoint-back-link.hbs b/app/components/agendapoint-back-link.hbs index 8116c1d9f..ec945a38e 100644 --- a/app/components/agendapoint-back-link.hbs +++ b/app/components/agendapoint-back-link.hbs @@ -1,11 +1,15 @@ {{#if @meetingId}} - - - {{t "agendapoint.back-to-meeting" adminBody=this.administrativeBodyName date=(detailed-date this.meeting.geplandeStart)}} + + + {{t + 'agendapoint.back-to-meeting' + adminBody=this.administrativeBodyName + date=(detailed-date this.meeting.geplandeStart) + }} {{else}} - - + + {{t 'inbox.agendapoints.return'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/app/components/agendapoint-menu.hbs b/app/components/agendapoint-menu.hbs index d47e1220f..2b1478b1b 100644 --- a/app/components/agendapoint-menu.hbs +++ b/app/components/agendapoint-menu.hbs @@ -1,15 +1,36 @@ - + {{#if @documentContainer}} - - {{t "attachments.return"}} + + {{t 'attachments.return'}} - - {{t "attachments.attachments"}} + + {{t 'attachments.attachments'}} {{#if this.attachmentCount}}( {{this.attachmentCount}} ){{/if}} - - {{t "agendapoint.revisions"}} + + {{t 'agendapoint.revisions'}} {{#if this.revisionCount}}( {{this.revisionCount}} ){{/if}} - {{/if}} - + {{/if}} + \ No newline at end of file diff --git a/app/components/app-chrome.hbs b/app/components/app-chrome.hbs index 3c1747e31..c7d479dce 100644 --- a/app/components/app-chrome.hbs +++ b/app/components/app-chrome.hbs @@ -1,58 +1,65 @@ + \ No newline at end of file diff --git a/app/components/application-header.hbs b/app/components/application-header.hbs index ac61096e6..5ed40e1f7 100644 --- a/app/components/application-header.hbs +++ b/app/components/application-header.hbs @@ -1,20 +1,26 @@ - + {{#if this.session.isAuthenticated}} - - {{!-- template-lint-disable require-context-role --}} - - {{t "auth.switch-administrative-unit"}} - - - {{t "auth.logout"}} - - + + {{! template-lint-disable require-context-role }} + + {{t 'auth.switch-administrative-unit'}} + + + {{t 'auth.logout'}} + + {{else}} - - {{t "auth.login"}} - + + {{t 'auth.login'}} + {{/if}} - + \ No newline at end of file diff --git a/app/components/behandeling-van-agendapunt.hbs b/app/components/behandeling-van-agendapunt.hbs index 341312657..122e2afa1 100644 --- a/app/components/behandeling-van-agendapunt.hbs +++ b/app/components/behandeling-van-agendapunt.hbs @@ -1,44 +1,56 @@ {{#if this.editable}} -
- +
+ {{limit-content @behandeling.onderwerp.titel 80}} -
- {{t - "behandeling-van-agendapunten.visibility"}} +
+ {{t 'behandeling-van-agendapunten.visibility'}} {{#let (unique-id) as |id|}} -  {{t - "behandeling-van-agendapunten.openbaar-label"}} + +  {{t 'behandeling-van-agendapunten.openbaar-label'}} {{/let}} {{#if this.toggleOpenbaar.isRunning}} - + {{/if}}
{{else}} -
+
- + {{limit-content @behandeling.onderwerp.titel 80}} {{#if this.published}} - - {{t "manage-agenda-zitting-modal.ap-published-msg"}} + + {{t 'manage-agenda-zitting-modal.ap-published-msg'}} {{/if}} -
- {{t - "behandeling-van-agendapunten.visibility"}} - +
+ {{t 'behandeling-van-agendapunten.visibility'}} + {{#if this.openbaar}} - {{t "behandeling-van-agendapunten.openbaar-msg"}} + {{t 'behandeling-van-agendapunten.openbaar-msg'}} {{else}} - {{t "behandeling-van-agendapunten.geen-openbaar-msg"}} + {{t 'behandeling-van-agendapunten.geen-openbaar-msg'}} {{/if}}
@@ -47,65 +59,94 @@ {{/if}} {{#if this.isLoading}} - - {{t "participation-list.loading-title"}} + + {{t 'participation-list.loading-title'}} {{else}} {{/if}} - {{#if this.hasParticipants}} -
- {{t - "behandeling-van-agendapunten.voting-title"}} - +
+ {{t + 'behandeling-van-agendapunten.voting-title' + }} +
{{else}} -
- {{t - "behandeling-van-agendapunten.needs-participants"}} +
+ {{t + 'behandeling-van-agendapunten.needs-participants' + }}
{{/if}} -
-
- {{t "behandeling-van-agendapunten.content-title"}} +
+
+ {{t + 'behandeling-van-agendapunten.content-title' + }} + {{#if this.attachments}} {{#if this.editable}} - - {{this.attachments.length}} - + + {{this.attachments.length}} + {{else}} - - {{this.attachments.length}} - + + {{this.attachments.length}} + {{/if}} {{/if}}
-
+
{{@behandeling.documentContainer.currentVersion.htmlSafeContent}}
{{#if (and this.editable @behandeling.documentContainer)}} - - {{t "behandeling-van-agendapunten.edit-document"}} + + {{t 'behandeling-van-agendapunten.edit-document'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/app/components/contact-form.hbs b/app/components/contact-form.hbs index 656e5e9ae..b5d4058db 100644 --- a/app/components/contact-form.hbs +++ b/app/components/contact-form.hbs @@ -1,19 +1,31 @@ {{yield}} -
- {{t "contact.about"}} + + {{t 'contact.about'}}
  • - +
  • - +
{{#if this.mailto}} - {{t "contact.send"}} + {{t + 'contact.send' + }} {{else}} - {{t "contact.compose"}} + {{t 'contact.compose'}} {{/if}} -
-
+
+ \ No newline at end of file diff --git a/app/components/date-time-picker.hbs b/app/components/date-time-picker.hbs index 9e4e6a0b4..c000f7290 100644 --- a/app/components/date-time-picker.hbs +++ b/app/components/date-time-picker.hbs @@ -1,7 +1,7 @@ -
-
+
+
{{#let (unique-id) as |id|}} - {{t "date-time-picker.date"}} + {{t 'date-time-picker.date'}} {{/let}}
-
+
{{#let (unique-id) as |id|}} - {{t "date-time-picker.hours"}} - + {{t 'date-time-picker.hours'}} + {{/let}}
-
+
{{#let (unique-id) as |id|}} - {{t "date-time-picker.minutes"}} - + {{t 'date-time-picker.minutes'}} + {{/let}}
-
+
\ No newline at end of file diff --git a/app/components/delete-meeting.hbs b/app/components/delete-meeting.hbs index 5fb626986..67519fd44 100644 --- a/app/components/delete-meeting.hbs +++ b/app/components/delete-meeting.hbs @@ -1,19 +1,35 @@ {{#if this.visible}} - - - {{t "meetings.delete.delete"}} + + + {{t 'meetings.delete.delete'}} {{#if this.displayDeleteModal}} + @closeModal={{fn (mut this.displayDeleteModal) false}} + as |Modal| + > -

{{t "meetings.delete.warning"}}

+

{{t 'meetings.delete.warning'}}

 - {{t "meetings.delete.confirm-button"}} - {{t "meetings.delete.back"}} + {{t 'meetings.delete.confirm-button'}} + {{t 'meetings.delete.back'}} {{/if}} diff --git a/app/components/document-attachments.hbs b/app/components/document-attachments.hbs index e7a77a10f..65e1fd4e2 100644 --- a/app/components/document-attachments.hbs +++ b/app/components/document-attachments.hbs @@ -1,63 +1,101 @@ -
- +
+
{{#if @documentContainer.attachments}} -
-
- - - - - - - - {{!-- --}} - - - - {{#each this.attachments as |attachment|}} - - - - - - - - {{/each}} - -
{{t "attachments.filename"}}{{t "attachments.filesize"}}{{t "attachments.decision"}}{{t "attachments.type"}}{{t "attachments.delete"}}
- - {{attachment.file.name}} - - {{attachment.file.humanReadableSize}} - {{#let (unique-id) as |id|}} - - - {{/let}} - - - - - {{t "attachments.delete"}} - -
+
+
+ + + + + + + + {{!-- --}} + + + + {{#each this.attachments as |attachment|}} + + + + + + + + {{/each}} + +
{{t 'attachments.filename'}}{{t 'attachments.filesize'}}{{t 'attachments.decision'}}{{t 'attachments.type'}}{{t "attachments.delete"}}
+ + {{attachment.file.name}} + + {{attachment.file.humanReadableSize}} + {{#let (unique-id) as |id|}} + + + {{/let}} + + + + + {{t 'attachments.delete'}} + +
+
-
{{/if}} {{#unless @decisions.length}} - - -

{{t "attachments.decision-required"}}

- - + + +

{{t 'attachments.decision-required'}}

+ + {{/unless}} \ No newline at end of file diff --git a/app/components/document-creator.hbs b/app/components/document-creator.hbs index d68c983b5..6b8e25199 100644 --- a/app/components/document-creator.hbs +++ b/app/components/document-creator.hbs @@ -1,29 +1,30 @@ {{#if this.ensureTemplates.isRunning}} - {{yield (hash - form=(component "au-loader") - create=this.create - rollback=this.rollback - isSaving=this.isSaving - errorSaving=this.errorSaving + {{yield + (hash + form=(component 'au-loader') + create=this.create + rollback=this.rollback + isSaving=this.isSaving + errorSaving=this.errorSaving ) }} {{else}} - {{yield (hash - form= - (component - "document-creator/form" - title=this.title - invalidTitle=this.invalidTitle - invalidTemplate=this.invalidTemplate - updateTitle=this.updateTitle - selectedTemplate=this.template - options=@templateOptions - onSelectTemplate=this.onSelectTemplate - ) - create=this.create - rollback=this.rollback - isSaving=this.isSaving - errorSaving=this.errorSaving + {{yield + (hash + form=(component + 'document-creator/form' + title=this.title + invalidTitle=this.invalidTitle + invalidTemplate=this.invalidTemplate + updateTitle=this.updateTitle + selectedTemplate=this.template + options=@templateOptions + onSelectTemplate=this.onSelectTemplate + ) + create=this.create + rollback=this.rollback + isSaving=this.isSaving + errorSaving=this.errorSaving ) }} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/app/components/document-creator/form.hbs b/app/components/document-creator/form.hbs index 844ef78bd..f6d5808ba 100644 --- a/app/components/document-creator/form.hbs +++ b/app/components/document-creator/form.hbs @@ -1,27 +1,36 @@ -
+
{{#let (unique-id) as |id|}} - {{t "document-creator.title-field"}} + {{t 'document-creator.title-field'}} - + {{/let}}
{{#let (unique-id) as |id|}} - {{t "document-creator.template"}} - + {{t 'document-creator.template'}} + + as |option| + > {{option.title}} {{/let}}
-
+ \ No newline at end of file diff --git a/app/components/document-history.hbs b/app/components/document-history.hbs index be1a655fb..29ac1c9db 100644 --- a/app/components/document-history.hbs +++ b/app/components/document-history.hbs @@ -1,40 +1,80 @@ -
+ @padding='none' + as |Modal| +> {{#if @isCurrentVersion}} -

- {{t 'utils.current-version'}}: - {{human-friendly-date @currentVersion.updatedOn locale=this.intl.primaryLocale}} +

+ {{t + 'utils.current-version' + }}: + + {{human-friendly-date + @currentVersion.updatedOn + locale=this.intl.primaryLocale + }}

{{else}} -

- - {{t 'utils.current-version'}}: - {{human-friendly-date @currentVersion.updatedOn locale=this.intl.primaryLocale}} - -

+

+ + {{t 'utils.current-version'}}: + + {{human-friendly-date + @currentVersion.updatedOn + locale=this.intl.primaryLocale + }} + +

{{/if}} -
-