EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1615 from crazyserver/MOBILE-2638

Browse Source 
MOBILE-2638 badges: Add 2.0 specification fields
This commit is contained in:
Juan Leyva 2018-11-20 15:29:30 +01:00 committed by GitHub
commit bb3a525a5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 182 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/langindex.json
View File

@ -1,15 +1,31 @@
{
"addon.badges.alignment": "badges",
"addon.badges.badgedetails": "badges",
"addon.badges.badges": "badges",
"addon.badges.bendorsement": "badges",
"addon.badges.claimcomment": "badges",
"addon.badges.claimid": "badges",
"addon.badges.contact": "badges",
"addon.badges.dateawarded": "badges",
"addon.badges.expired": "badges",
"addon.badges.expirydate": "badges",
"addon.badges.imageauthoremail": "badges",
"addon.badges.imageauthorname": "badges",
"addon.badges.imageauthorurl": "badges",
"addon.badges.imagecaption": "badges",
"addon.badges.issuancedetails": "badges",
"addon.badges.issuerdetails": "badges",
"addon.badges.issueremail": "badges",
"addon.badges.issuername": "badges",
"addon.badges.language": "badges",
"addon.badges.noalignment": "badges",
"addon.badges.nobadges": "badges",
"addon.badges.noendorsement": "badges",
"addon.badges.norelated": "badges",
"addon.badges.recipientdetails": "badges",
"addon.badges.relatedbages": "badges",
"addon.badges.version": "badges",
"addon.badges.warnexpired": "badges",
"addon.block_activitymodules.pluginname": "block_activity_modules",
"addon.block_myoverview.all": "block_myoverview",
"addon.block_myoverview.favourites": "block_myoverview",

18
src/addon/badges/lang/en.json
View File

@ -1,13 +1,29 @@
{
"alignment": "Competencies alignment",
"badgedetails": "Badge details",
"badges": "Badges",
"bendorsement": "Endorsement",
"claimcomment": "Endorsement Comment",
"claimid": "Claim URL",
"contact": "Contact",
"dateawarded": "Date issued",
"expired": "Expired",
"expirydate": "Expiry date",
"imageauthoremail": "Image author's email",
"imageauthorname": "Image author's name",
"imageauthorurl": "Image author's URL",
"imagecaption": "Image caption",
"issuancedetails": "Badge expiry",
"issuerdetails": "Issuer details",
"issuername": "Issuer name",
"issueremail": "Email",
"language": "Language",
"noalignment": "This badge does not have a competencies alignment.",
"nobadges": "There are no badges available.",
"recipientdetails": "Recipient details"
"noendorsement": "This badge does not have an endorsement.",
"norelated": "This badge does not have related badges.",
"recipientdetails": "Recipient details",
"relatedbages": "Related badges",
"version": "Version",
"warnexpired": " (This badge has expired!)"
}

112
src/addon/badges/pages/issued-badge/issued-badge.html
View File

@ -54,7 +54,15 @@
</ion-item-divider>
<ion-item text-wrap *ngIf="badge.name">
<h2>{{ 'core.name' | translate}}</h2>
<p>{{badge.name}}</p>
<p>{{ badge.name }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.version">
<h2>{{ 'addon.badges.version' | translate}}</h2>
<p>{{ badge.version }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.language">
<h2>{{ 'addon.badges.language' | translate}}</h2>
<p>{{ badge.language }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.description">
<h2>{{ 'core.description' | translate}}</h2>
@ -62,12 +70,33 @@
<core-format-text clean="true" [text]="badge.description"></core-format-text>
</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.imageauthorname">
<h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
<p>{{ badge.imageauthorname }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.imageauthoremail">
<h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
<p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no">
<core-format-text [text]="badge.imageauthoremail"></core-format-text>
</a></p>
</ion-item>
<ion-item text-wrap *ngIf="badge.imageauthorurl">
<h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
<p><a [href]="badge.imageauthorurl" core-link auto-login="no">
<core-format-text [text]="badge.imageauthorurl"></core-format-text>
</a></p>
</ion-item>
<ion-item text-wrap *ngIf="badge.imagecaption">
<h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
<p><core-format-text [text]="badge.imagecaption"></core-format-text></p>
</ion-item>
<ion-item text-wrap *ngIf="course.fullname">
<h2>{{ 'core.course' | translate}}</h2>
<p>
<core-format-text [text]="course.fullname"></core-format-text>
</p>
</ion-item>
<!-- Criteria (not yet avalaible) -->
</ion-item-group>
<ion-item-group>
@ -80,7 +109,86 @@
</ion-item>
<ion-item text-wrap *ngIf="badge.dateexpire">
<h2>{{ 'addon.badges.expirydate' | translate}}</h2>
<p>{{badge.dateexpire | coreToLocaleString }}</p>
<p>
{{ badge.dateexpire | coreToLocaleString }}
<span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
{{ 'addon.badges.warnexpired' | translate }}
</span>
</p>
</ion-item>
<!-- Evidence (not yet avalaible) -->
</ion-item-group>
<!-- Endorsement -->
<ion-item-group *ngIf="badge.endorsement">
<ion-item-divider color="light">
<h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
</ion-item-divider>
<ion-item text-wrap *ngIf="badge.endorsement.issuername">
<h2>{{ 'addon.badges.issuername' | translate}}</h2>
<p>{{ badge.endorsement.issuername }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.issueremail">
<h2>{{ 'addon.badges.issueremail' | translate}}</h2>
<p><a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no">
<core-format-text [text]="badge.endorsement.issueremail"></core-format-text>
</a></p>
</ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.issuerurl">
<h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
<p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no">
<core-format-text [text]="badge.endorsement.issuerurl"></core-format-text>
</a></p>
</ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.dateissued">
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
<p>{{ badge.endorsement.dateissued | coreToLocaleString }}</p>
</ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.claimid">
<h2>{{ 'addon.badges.claimid' | translate}}</h2>
<p><a [href]="badge.endorsement.claimid" core-link auto-login="no">
<core-format-text [text]="badge.endorsement.claimid"></core-format-text>
</a></p>
</ion-item>
<ion-item text-wrap *ngIf="badge.endorsement.claimcomment">
<h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
<p>
<core-format-text [text]="badge.endorsement.claimcomment"></core-format-text>
</p>
</ion-item>
</ion-item-group>
<ion-item-group *ngIf="badge.relatedbadges && !badge.endorsement">
<ion-item-divider color="light">
<h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
</ion-item-divider>
<ion-item text-wrap>
<h2>{{ 'addon.badges.noendorsement' | translate}}</h2>
</ion-item>
</ion-item-group>
<!-- Related badges -->
<ion-item-group *ngIf="badge.relatedbadges">
<ion-item-divider color="light">
<h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
</ion-item-divider>
<ion-item text-wrap *ngFor="let relatedBadge of badge.relatedbadges">
<h2><core-format-text [text]="relatedBadge.name"></core-format-text></h2>
</ion-item>
<ion-item text-wrap *ngIf="badge.relatedbadges.length == 0">
<h2>{{ 'addon.badges.norelated' | translate}}</h2>
</ion-item>
</ion-item-group>
<!-- Competencies alignment -->
<ion-item-group *ngIf="badge.competencies">
<ion-item-divider color="light">
<h2>{{ 'addon.badges.alignment' | translate}}</h2>
</ion-item-divider>
<a ion-item text-wrap *ngFor="let competency of badge.competencies" [href]="competency.targeturl" core-link auto-login="no">
<h2><core-format-text [text]="competency.targetname"></core-format-text></h2>
</a>
<ion-item text-wrap *ngIf="badge.competencies.length == 0">
<h2>{{ 'addon.badges.noalignment' | translate}}</h2>
</ion-item>
</ion-item-group>
</core-loading>

45
src/addon/badges/pages/issued-badge/issued-badge.ts
View File

@ -14,12 +14,12 @@
import { Component, ViewChild } from '@angular/core';
import { IonicPage, Content, NavParams } from 'ionic-angular';
import { AddonBadgesProvider } from '../../providers/badges';
import { CoreTimeUtilsProvider } from '@providers/utils/time';
import { CoreDomUtilsProvider } from '@providers/utils/dom';
import { CoreSitesProvider } from '@providers/sites';
import { CoreUserProvider } from '@core/user/providers/user';
import { CoreCoursesProvider } from '@core/courses/providers/courses';
import { AddonBadgesProvider } from '../../providers/badges';
/**
* Page that displays the list of calendar events.
@ -32,9 +32,10 @@ import { CoreCoursesProvider } from '@core/courses/providers/courses';
export class AddonBadgesIssuedBadgePage {
@ViewChild(Content) content: Content;
courseId: number;
userId: number;
badgeHash: string;
protected badgeHash: string;
protected userId: number;
protected courseId: number;
user: any = {};
course: any = {};
badge: any = {};
@ -70,29 +71,29 @@ export class AddonBadgesIssuedBadgePage {
const promises = [];
this.currentTime = this.timeUtils.timestamp();
let promise = this.userProvider.getProfile(this.userId, this.courseId, true).then((user) => {
promises.push(this.userProvider.getProfile(this.userId, this.courseId, true).then((user) => {
this.user = user;
});
promises.push(promise);
}));
promise = this.badgesProvider.getUserBadges(this.courseId, this.userId).then((badges) => {
badges.forEach((badge) => {
if (this.badgeHash == badge.uniquehash) {
this.badge = badge;
if (badge.courseid) {
return this.coursesProvider.getUserCourse(badge.courseid, true).then((course) => {
this.course = course;
}).catch(() => {
// Maybe an old deleted course.
this.course = null;
});
}
}
promises.push(this.badgesProvider.getUserBadges(this.courseId, this.userId).then((badges) => {
const badge = badges.find((badge) => {
return this.badgeHash == badge.uniquehash;
});
if (badge) {
this.badge = badge;
if (badge.courseid) {
return this.coursesProvider.getUserCourse(badge.courseid, true).then((course) => {
this.course = course;
}).catch(() => {
// Maybe an old deleted course.
this.course = null;
});
}
}
}).catch((message) => {
this.domUtils.showErrorModalDefault(message, 'Error getting badge data.');
});
promises.push(promise);
}));
return Promise.all(promises);
}

16
src/assets/lang/en.json
View File

@ -1,15 +1,31 @@
{
"addon.badges.alignment": "Competencies alignment",
"addon.badges.badgedetails": "Badge details",
"addon.badges.badges": "Badges",
"addon.badges.bendorsement": "Endorsement",
"addon.badges.claimcomment": "Endorsement Comment",
"addon.badges.claimid": "Claim URL",
"addon.badges.contact": "Contact",
"addon.badges.dateawarded": "Date issued",
"addon.badges.expired": "Expired",
"addon.badges.expirydate": "Expiry date",
"addon.badges.imageauthoremail": "Image author's email",
"addon.badges.imageauthorname": "Image author's name",
"addon.badges.imageauthorurl": "Image author's URL",
"addon.badges.imagecaption": "Image caption",
"addon.badges.issuancedetails": "Badge expiry",
"addon.badges.issuerdetails": "Issuer details",
"addon.badges.issueremail": "Email",
"addon.badges.issuername": "Issuer name",
"addon.badges.language": "Language",
"addon.badges.noalignment": "This badge does not have a competencies alignment.",
"addon.badges.nobadges": "There are no badges available.",
"addon.badges.noendorsement": "This badge does not have an endorsement.",
"addon.badges.norelated": "This badge does not have related badges.",
"addon.badges.recipientdetails": "Recipient details",
"addon.badges.relatedbages": "Related badges",
"addon.badges.version": "Version",
"addon.badges.warnexpired": " (This badge has expired!)",
"addon.block_activitymodules.pluginname": "Activities",
"addon.block_myoverview.all": "All",
"addon.block_myoverview.favourites": "Starred",