From 1607ba9c4bddb78e23bbd1d5c3861454dea54ee5 Mon Sep 17 00:00:00 2001 From: Trif Adriana Date: Fri, 26 Aug 2022 11:22:13 +0300 Subject: [PATCH 1/3] Not Due Yet - status --- .../src_ts/elements/ip-reporting/pd-report-filters.ts | 3 ++- .../elements/ip-reporting/progress-reports-filters.ts | 3 ++- frontend_ip/src_ts/etools-prp-common | 2 +- frontend_ip/src_ts/locales.ts | 7 ++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts b/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts index 3b04bbacd..752edece6 100644 --- a/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts +++ b/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts @@ -71,7 +71,8 @@ class PdReportFilters extends LocalizeMixin(UtilsMixin(ReduxConnectedElement)) { {title: this.localize('due'), id: 'Due'}, {title: this.localize('all'), id: ''}, {title: this.localize('submitted'), id: 'Sub'}, - {title: this.localize('accepted'), id: 'Acc'} + {title: this.localize('accepted'), id: 'Acc'}, + {title: this.localize('not_due_yet'), id: 'Not'} ]; } } diff --git a/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts b/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts index 3045e8d47..0ae3f2680 100644 --- a/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts +++ b/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts @@ -106,7 +106,8 @@ class ProgressReportsFilters extends UtilsMixin(LocalizeMixin(ReduxConnectedElem {title: this.localize('sent_back'), id: 'Sen'}, {title: this.localize('due'), id: 'Due'}, {title: this.localize('submitted'), id: 'Sub'}, - {title: this.localize('accepted'), id: 'Acc'} + {title: this.localize('accepted'), id: 'Acc'}, + {title: this.localize('not_due_yet'), id: 'Not'} ]; } diff --git a/frontend_ip/src_ts/etools-prp-common b/frontend_ip/src_ts/etools-prp-common index e0b1beb0d..c7aee866e 160000 --- a/frontend_ip/src_ts/etools-prp-common +++ b/frontend_ip/src_ts/etools-prp-common @@ -1 +1 @@ -Subproject commit e0b1beb0daf4c95105366934397f5e80feb988e2 +Subproject commit c7aee866ea4eb3a039053ce525cdacef7168460f diff --git a/frontend_ip/src_ts/locales.ts b/frontend_ip/src_ts/locales.ts index becf10dc4..dc14c83a0 100644 --- a/frontend_ip/src_ts/locales.ts +++ b/frontend_ip/src_ts/locales.ts @@ -126,6 +126,7 @@ export const locales = { overdue: 'Overdue', sent_back: 'Sent back', due: 'Due', + not_due_yet: 'Not Due Yet', submitted: 'Submitted', accepted: 'Accepted', report_status: 'Report Status', @@ -605,6 +606,7 @@ export const locales = { reports: 'Rapports', all: 'Tout', overdue: 'En souffrance', + not_due_yet: 'Pas Encore Dû', sent_back: 'Refusé', due: 'Dû', submitted: 'Soumis', @@ -1091,6 +1093,7 @@ export const locales = { reports: 'Informes', all: 'Todo', overdue: 'Atrasado', + not_due_yet: 'Aún no vence', sent_back: 'Devuelto', due: 'Pendiente', submitted: 'Enviado', @@ -1578,6 +1581,7 @@ export const locales = { reports: 'Отчеты', all: 'Все', overdue: 'Просроченный', + not_due_yet: 'еще не срок', sent_back: 'Возвращенный', due: 'Ожидаемый', submitted: 'Представленный на рассмотрение', @@ -2067,7 +2071,7 @@ export const locales = { terminated: 'Terminado', reports: 'Relatórios', all: 'Todos', - overdue: 'Fora do Prazo', + overdue: 'Ainda não venceu', sent_back: 'Enviado de volta', due: 'No Prazo', submitted: 'Submetido', @@ -2551,6 +2555,7 @@ export const locales = { reports: 'تقارير', all: 'الكل', overdue: 'متأخرة', + not_due_yet: 'ليس مستحقًا بعد', sent_back: 'أُرجِعْ ', due: 'مُسْتَحقْ', submitted: 'مُقَدَّم إلى', From cd2e8441d49d576a703c83a6166166f837a7fdcf Mon Sep 17 00:00:00 2001 From: Trif Adriana Date: Fri, 26 Aug 2022 11:24:39 +0300 Subject: [PATCH 2/3] Not Due Yet - status --- frontend_ip/src_ts/locales.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend_ip/src_ts/locales.ts b/frontend_ip/src_ts/locales.ts index dc14c83a0..06ab50587 100644 --- a/frontend_ip/src_ts/locales.ts +++ b/frontend_ip/src_ts/locales.ts @@ -2071,7 +2071,8 @@ export const locales = { terminated: 'Terminado', reports: 'Relatórios', all: 'Todos', - overdue: 'Ainda não venceu', + overdue: 'Fora do Prazo', + not_due_yet: 'Ainda não venceu', sent_back: 'Enviado de volta', due: 'No Prazo', submitted: 'Submetido', From eb4e683ac1752a5419761a25243b2a4bdc452ee5 Mon Sep 17 00:00:00 2001 From: Trif Adriana Date: Mon, 29 Aug 2022 20:35:01 +0300 Subject: [PATCH 3/3] not yet due --- .../elements/ip-reporting/pd-report-filters.ts | 2 +- .../ip-reporting/progress-reports-filters.ts | 2 +- frontend_ip/src_ts/etools-prp-common | 2 +- frontend_ip/src_ts/locales.ts | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts b/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts index 752edece6..a1d0dcd18 100644 --- a/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts +++ b/frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts @@ -72,7 +72,7 @@ class PdReportFilters extends LocalizeMixin(UtilsMixin(ReduxConnectedElement)) { {title: this.localize('all'), id: ''}, {title: this.localize('submitted'), id: 'Sub'}, {title: this.localize('accepted'), id: 'Acc'}, - {title: this.localize('not_due_yet'), id: 'Not'} + {title: this.localize('not_yet_due'), id: 'Not'} ]; } } diff --git a/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts b/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts index 0ae3f2680..fb266e068 100644 --- a/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts +++ b/frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts @@ -107,7 +107,7 @@ class ProgressReportsFilters extends UtilsMixin(LocalizeMixin(ReduxConnectedElem {title: this.localize('due'), id: 'Due'}, {title: this.localize('submitted'), id: 'Sub'}, {title: this.localize('accepted'), id: 'Acc'}, - {title: this.localize('not_due_yet'), id: 'Not'} + {title: this.localize('not_yet_due'), id: 'Not'} ]; } diff --git a/frontend_ip/src_ts/etools-prp-common b/frontend_ip/src_ts/etools-prp-common index c7aee866e..7bf42332f 160000 --- a/frontend_ip/src_ts/etools-prp-common +++ b/frontend_ip/src_ts/etools-prp-common @@ -1 +1 @@ -Subproject commit c7aee866ea4eb3a039053ce525cdacef7168460f +Subproject commit 7bf42332fe43e6c4caea13467ccd3f21ff02532a diff --git a/frontend_ip/src_ts/locales.ts b/frontend_ip/src_ts/locales.ts index 06ab50587..a9ed81ec1 100644 --- a/frontend_ip/src_ts/locales.ts +++ b/frontend_ip/src_ts/locales.ts @@ -126,7 +126,7 @@ export const locales = { overdue: 'Overdue', sent_back: 'Sent back', due: 'Due', - not_due_yet: 'Not Due Yet', + not_yet_due: 'Not Yet Due', submitted: 'Submitted', accepted: 'Accepted', report_status: 'Report Status', @@ -606,7 +606,7 @@ export const locales = { reports: 'Rapports', all: 'Tout', overdue: 'En souffrance', - not_due_yet: 'Pas Encore Dû', + not_yet_due: 'Pas Encore Dû', sent_back: 'Refusé', due: 'Dû', submitted: 'Soumis', @@ -1093,7 +1093,7 @@ export const locales = { reports: 'Informes', all: 'Todo', overdue: 'Atrasado', - not_due_yet: 'Aún no vence', + not_yet_due: 'Aún no vence', sent_back: 'Devuelto', due: 'Pendiente', submitted: 'Enviado', @@ -1581,7 +1581,7 @@ export const locales = { reports: 'Отчеты', all: 'Все', overdue: 'Просроченный', - not_due_yet: 'еще не срок', + not_yet_due: 'еще не срок', sent_back: 'Возвращенный', due: 'Ожидаемый', submitted: 'Представленный на рассмотрение', @@ -2072,7 +2072,7 @@ export const locales = { reports: 'Relatórios', all: 'Todos', overdue: 'Fora do Prazo', - not_due_yet: 'Ainda não venceu', + not_yet_due: 'Ainda não venceu', sent_back: 'Enviado de volta', due: 'No Prazo', submitted: 'Submetido', @@ -2556,7 +2556,7 @@ export const locales = { reports: 'تقارير', all: 'الكل', overdue: 'متأخرة', - not_due_yet: 'ليس مستحقًا بعد', + not_yet_due: 'ليس مستحقًا بعد', sent_back: 'أُرجِعْ ', due: 'مُسْتَحقْ', submitted: 'مُقَدَّم إلى',