Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ch28658]Not Yet Due - status #1822

Merged
merged 5 commits into from
Sep 2, 2022
Merged

[ch28658]Not Yet Due - status #1822

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1607ba9
Not Due Yet - status
acory Aug 26, 2022
cd2e844
Not Due Yet - status
acory Aug 26, 2022
eb4e683
not yet due
acory Aug 29, 2022
9ee7060
Merge branch 'develop' into not-yet-due-status-28658
acory Aug 31, 2022
aff3715
Merge branch 'develop' into not-yet-due-status-28658
acory Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend_ip/src_ts/elements/ip-reporting/pd-report-filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
];
}
}
Expand Down
3 changes: 2 additions & 1 deletion frontend_ip/src_ts/elements/ip-reporting/progress-reports-filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
];
}

Expand Down
2 changes: 1 addition & 1 deletion frontend_ip/src_ts/etools-prp-common
Open in desktop
Submodule etools-prp-common updated 1 files
+2 −0 elements/report-status.ts
6 changes: 6 additions & 0 deletions frontend_ip/src_ts/locales.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -1578,6 +1581,7 @@ export const locales = {
reports: 'Отчеты',
all: 'Все',
overdue: 'Просроченный',
not_due_yet: 'еще не срок',
sent_back: 'Возвращенный',
due: 'Ожидаемый',
submitted: 'Представленный на рассмотрение',
Expand Down Expand Up @@ -2068,6 +2072,7 @@ export const locales = {
reports: 'Relatórios',
all: 'Todos',
overdue: 'Fora do Prazo',
not_due_yet: 'Ainda não venceu',
sent_back: 'Enviado de volta',
due: 'No Prazo',
submitted: 'Submetido',
Expand Down Expand Up @@ -2551,6 +2556,7 @@ export const locales = {
reports: 'تقارير',
all: 'الكل',
overdue: 'متأخرة',
not_due_yet: 'ليس مستحقًا بعد',
sent_back: 'أُرجِعْ ',
due: 'مُسْتَحقْ',
submitted: 'مُقَدَّم إلى',
Expand Down