CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

Merge pull request #3987 from dpalou/MOBILE-2768

Browse Source 
MOBILE-2768 policy: Display Inactive badge in certain policies
This commit is contained in:
Pau Ferrer Ocaña 2024-03-21 11:31:14 +01:00 committed by GitHub
commit 797617b992
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/langindex.json
View File

@ -86,10 +86,9 @@
"addon.block_timeline.sortbycourses": "block_timeline", "addon.block_timeline.sortbycourses": "block_timeline",
"addon.block_timeline.sortbydates": "block_timeline", "addon.block_timeline.sortbydates": "block_timeline",
"addon.blog.addnewentry": "blog", "addon.blog.addnewentry": "blog",
"addon.blog.associations": "blog",
"addon.blog.associatewithcourse": "blog", "addon.blog.associatewithcourse": "blog",
"addon.blog.associatewithmodule": "blog", "addon.blog.associatewithmodule": "blog",
"addon.blog.attachment": "blog", "addon.blog.associations": "blog",
"addon.blog.blog": "blog", "addon.blog.blog": "blog",
"addon.blog.blogentries": "blog", "addon.blog.blogentries": "blog",
"addon.blog.entrybody": "blog", "addon.blog.entrybody": "blog",
@ -2321,6 +2320,7 @@
"core.policy.responseon": "tool_policy", "core.policy.responseon": "tool_policy",
"core.policy.sitepolicynotagreederror": "local_moodlemobileapp", "core.policy.sitepolicynotagreederror": "local_moodlemobileapp",
"core.policy.status1": "tool_policy", "core.policy.status1": "tool_policy",
"core.policy.status2": "tool_policy",
"core.policy.steppolicies": "tool_policy", "core.policy.steppolicies": "tool_policy",
"core.policy.useracceptanceactionaccept": "tool_policy", "core.policy.useracceptanceactionaccept": "tool_policy",
"core.policy.useracceptanceactionacceptone": "tool_policy", "core.policy.useracceptanceactionacceptone": "tool_policy",

1
src/addons/blog/lang.json
View File

@ -1,7 +1,6 @@
{ {
"addnewentry": "Add a new entry", "addnewentry": "Add a new entry",
"associations": "Associations", "associations": "Associations",
"attachment": "Attachment",
"blog": "Blog", "blog": "Blog",
"blogentries": "Blog entries", "blogentries": "Blog entries",
"entrybody": "Blog entry body", "entrybody": "Blog entry body",

1
src/core/features/policy/lang.json
View File

@ -28,6 +28,7 @@
"sitepolicynotagreederror": "Site policy not agreed.", "sitepolicynotagreederror": "Site policy not agreed.",
"steppolicies": "Policy {{$a.numpolicy}} out of {{$a.totalpolicies}}", "steppolicies": "Policy {{$a.numpolicy}} out of {{$a.totalpolicies}}",
"status1": "Active", "status1": "Active",
"status2": "Inactive",
"useracceptanceactionaccept": "Accept", "useracceptanceactionaccept": "Accept",
"useracceptanceactionacceptone": "Accept {{$a}}", "useracceptanceactionacceptone": "Accept {{$a}}",
"useracceptanceactiondecline": "Decline", "useracceptanceactiondecline": "Decline",

3
src/core/features/policy/pages/acceptances/acceptances.html
View File

@ -82,6 +82,9 @@
<ion-badge color="success" *ngIf="policy.status === activeStatus"> <ion-badge color="success" *ngIf="policy.status === activeStatus">
{{ 'core.policy.status1' | translate }} {{ 'core.policy.status1' | translate }}
</ion-badge> </ion-badge>
<ion-badge color="danger" *ngIf="!isPreviousVersion && policy.status === inactiveStatus">
{{ 'core.policy.status2' | translate }}
</ion-badge>
<ion-badge color="info" *ngIf="policy.optional"> <ion-badge color="info" *ngIf="policy.optional">
{{ 'core.policy.policydocoptionalyes' | translate }} {{ 'core.policy.policydocoptionalyes' | translate }}
</ion-badge> </ion-badge>

1
src/core/features/policy/pages/acceptances/acceptances.ts
View File

@ -41,6 +41,7 @@ export class CorePolicyAcceptancesPage implements OnInit, OnDestroy {
dataLoaded = false; dataLoaded = false;
policies: ActiveSitePolicy[] = []; policies: ActiveSitePolicy[] = [];
activeStatus = CorePolicyStatus.Active; activeStatus = CorePolicyStatus.Active;
inactiveStatus = CorePolicyStatus.Archived;
isTablet = false; isTablet = false;
hasOnBehalf = false; hasOnBehalf = false;
canContactDPO = false; canContactDPO = false;