diff --git a/src/pages/activities/list/popup.ts b/src/pages/activities/list/popup.ts
index c461f689..44a0e7f4 100644
--- a/src/pages/activities/list/popup.ts
+++ b/src/pages/activities/list/popup.ts
@@ -13,7 +13,6 @@ import { loadingMessages, errMessages } from '../../../app/messages';
templateUrl: 'popup.html'
})
export class ActivityListPopupPage {
-
achievementData: any = null;
achievementName: string;
achievementsLoadingErr: any = errMessages.General.loading.load;
diff --git a/src/pages/activities/view/activities-view-modal.page.ts b/src/pages/activities/view/activities-view-modal.page.ts
index de9f5009..5e15d25c 100644
--- a/src/pages/activities/view/activities-view-modal.page.ts
+++ b/src/pages/activities/view/activities-view-modal.page.ts
@@ -24,7 +24,7 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
diff --git a/src/pages/activities/view/activities-view.page.ts b/src/pages/activities/view/activities-view.page.ts
index 2ca2f247..455df018 100644
--- a/src/pages/activities/view/activities-view.page.ts
+++ b/src/pages/activities/view/activities-view.page.ts
@@ -21,7 +21,6 @@ export class ActivitiesViewPage {
};
activity: any = {};
assessment: any = {};
- assessments: any = {};
loadings = {
submissions: false
};
@@ -51,7 +50,6 @@ export class ActivitiesViewPage {
ionViewDidEnter(): void {
// assessment
this.activity = this.activityService.normaliseActivity(this.navParams.get('activity') || {});
- this.assessments = this.activity.sequences || [];
this.assessment = this.activity.assessment;
// submission
@@ -64,6 +62,8 @@ export class ActivitiesViewPage {
return this.submissionService.normalise(submission);
});
this.submissions = _.orderBy(this.submissions, 'created', 'desc'); // latest at top
+
+ this.submissions = this.setSubmissionStatusTitle(this.submissions);
}
});
@@ -128,7 +128,7 @@ export class ActivitiesViewPage {
goAssessment(submission?, opts = { hasSubmission: false }) {
if ((this.inProgressSubmission()).length > 0 && opts.hasSubmission === false) {
let alert = this.alertCtrl.create({
- title: 'You have a submission in progress.',
+ title: 'You already have started a new submission! Please tap on "In Progress" below to continue with it.',
buttons: ["Ok"]
});
alert.present();
@@ -146,4 +146,66 @@ export class ActivitiesViewPage {
});
}
}
+
+ /**
+ * @name setSubmissionStatusTitle
+ * @description refer to assessment status and inject proper UI displayable title for different submissions (in a assessments, multiple submission has no unique title, this function is added to help user identify different submission by title)
+ * @param {Array
+
+
+
+ Waiting for Review
+ Done
+ In Progress
+ {{ (submission.submitted || submission.created).format() | amDateFormat:"MMM D YYYY, h:mm a" }}
-
-
- {{ submission.status }}
+
+
+
+
+
+ {{ submission.statusTitle | truncate: 50 }}
+ {{ submission.statusTitle.name }}
+ {{ (submission.submitted || submission.created).format() | amDateFormat:"MMM D YYYY, h:mm a" }}
+
+
+ {{ submission.statusTitle.score }}
+
diff --git a/src/pages/assessments/assessments.html b/src/pages/assessments/assessments.html
index 02d56f6b..888e687c 100644
--- a/src/pages/assessments/assessments.html
+++ b/src/pages/assessments/assessments.html
@@ -1,7 +1,6 @@
-
-
-
+
+
-
+
- {{ assessment.name }}
-
+ {{ assessment.name }}
+
-
+ (click)="gotoAssessment(group, activity)">
diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index bb5ba3a8..3880cdaf 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -72,10 +72,7 @@ export class AssessmentsPage {
this.loadQuestions()
.then(() => {
loader.dismiss();
- }, err => {
- console.log('log::', err);
- })
- .catch((err) => {
+ }).catch(err => {
console.log(err);
loader.dismiss();
});
@@ -95,125 +92,102 @@ export class AssessmentsPage {
* @description mapping assessments and submissions
* @param {Object} submissions submissions
* @param {Object} assessments assessments
+ * @returns {Array} objects of compiled assessment + submissions
*/
- mapSubmissionsToAssessment(submissions, assessments) {
- _.forEach(assessments, (group, i) => {
- _.forEach(group, (assessment, j) => {
-
- // normalise
- assessments[i][j] = assessment = this.assessmentService.normalise(assessment);
-
- _.forEach(assessment.AssessmentGroup, (assessmentGroup, k) => {
- _.forEach(assessmentGroup.questions, (question, l) => {
- // Inject empty answer fields
- // We will know thare are no submission when it is null
- assessments[i][j].AssessmentGroup[k].questions[l].answer = null;
- assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = null;
+ mapSubmissionsToAssessment(submissions, assessmentsBatch) {
+ let result = [];
+
+ _.forEach(assessmentsBatch, (batch, i) => {
+
+ let assessmentResult = [];
+ _.forEach(batch, (assessment, j) => {
+ // normalised
+ let normalised = this.assessmentService.normalise(assessment);
+
+ // groups
+ let assessmentGroupResult = [];
+ _.forEach(normalised.AssessmentGroup, assessmentGroup => {
+ // questions
+ let questionsResult = [];
+ let submissionResult : any = {};
+ _.forEach(assessmentGroup.questions, question => {
+ // force answers as null by default (for checkings)
+ let questionResult : any = {
+ answer: null,
+ reviewerAnswer: null
+ };
// find submission
_.forEach(submissions, (submission) => {
// attach existing submission to assessment group it belongs to
- let group = this.assessmentGroups[i][j].AssessmentGroup[k];
- if (group.assessment_id === submission.assessment_id) {
- this.assessmentGroups[i][j].AssessmentGroup[k].submission = submission;
+ if (assessmentGroup.assessment_id === submission.assessment_id) {
+ submissionResult = submission;
}
// find user answer
_.forEach(submission.answer, (answer) => {
- if (answer.assessment_question_id === question.id) {
- assessments[i][j].AssessmentGroup[k].questions[l].answer = answer;
+ if (answer.assessment_question_id === question.question_id) {
+ questionResult.answer = answer;
}
});
// find reviewer feedback
_.forEach(submission.review, (reviewerAnswer) => {
- if (reviewerAnswer.assessment_question_id === question.id) {
- assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = reviewerAnswer;
+ if (reviewerAnswer.assessment_question_id === question.question_id) {
+ questionResult.reviewerAnswer = reviewerAnswer;
}
});
});
- });
-
- // Summarise basic answer information
- // get total number of questions
- assessments[i][j].AssessmentGroup[k].totalRequiredQuestions = 0;
- _.forEach(assessmentGroup.questions, (q) => {
- if (q.required) {
- assessments[i][j].AssessmentGroup[k].totalRequiredQuestions += 1;
+ // set assessmentGroup as accessible (submitter has no permission to view)
+ if (this.isAccessibleBySubmitter(question, submissionResult.status)) {
+ assessmentGroup.accessible = true;
+ questionsResult.push(Object.assign(question, questionResult));
}
});
- // get total number of answered questions
- assessments[i][j].AssessmentGroup[k].answeredQuestions = 0;
- _.forEach(assessmentGroup.questions, (q) => {
- if (q.required && q.answer && q.answer !== null) {
- assessments[i][j].AssessmentGroup[k].answeredQuestions += 1;
- }
- });
+ let summaries = this.assessmentService.getSummaries(questionsResult);
+ if (assessmentGroup.accessible) {
+ assessmentGroupResult.push(Object.assign(assessmentGroup, {
+ questions: questionsResult,
+ submission: submissionResult,
+ totalRequiredQuestions: summaries.totalRequiredQuestions,
+ answeredQuestions: summaries.answeredQuestions,
+ reviewerFeedback: summaries.reviewerFeedback,
+ status: this.assessmentService.getStatus(questionsResult, submissionResult)
+ }));
+ }
+ });
- // get total number of feedback
- assessments[i][j].AssessmentGroup[k].reviewerFeedback = 0;
- _.forEach(assessmentGroup.questions, (q) => {
- // If API response, the reviewer's answer and comment are empty,
- // front-end don't consider it as a feedback
- if (
- q.reviewerAnswer &&
- q.reviewerAnswer !== null &&
- !_.isEmpty(q.reviewerAnswer.answer) &&
- !_.isEmpty(q.reviewerAnswer.comment)
- ) {
- assessments[i][j].AssessmentGroup[k].reviewerFeedback += 1;
- }
- });
+ normalised.AssessmentGroup = assessmentGroupResult;
+ assessmentResult.push(normalised);
+ });
- // Set status
- // let status = assessments[i][j].AssessmentGroup[k].status = 'incomplete';
- let questionsStatus = [];
- _.forEach(assessmentGroup.questions, (q) => {
- if (q.required && q.answer !== null) {
- if (
- q.reviewerAnswer !== null &&
- assessmentGroup.submission.status !== 'pending approval' &&
- (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
- ) {
- questionsStatus.push('reviewed');
- } else {
- questionsStatus.push('completed');
- }
- }
+ result.push(assessmentResult);
+ });
- if (!q.required && q.answer !== null) {
- if (
- q.reviewerAnswer !== null &&
- assessmentGroup.submission.status !== 'pending approval' &&
- (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
- ) {
- questionsStatus.push('reviewed');
- } else {
- questionsStatus.push('completed');
- }
- }
+ return result;
+ }
- if (q.answer === null) {
- questionsStatus.push('incomplete');
- }
- });
+ /**
+ * @description filter question by condition (submitter cannot view reviewer
+ * question before it is published/reviewed)
+ * @param {object} question
+ * @param {string} status
+ */
+ isAccessibleBySubmitter(question, submissionStatus: string) {
+ let accessible = true;
+ let submitterAllowed = false;
- assessments[i][j].AssessmentGroup[k].status = 'incomplete';
- if (_.every(questionsStatus, (v) => {
- return (v === 'completed');
- })) {
- assessments[i][j].AssessmentGroup[k].status = 'completed';
- }
- if (_.includes(questionsStatus, 'reviewed')) {
- assessments[i][j].AssessmentGroup[k].status = 'reviewed';
- }
- });
- });
- });
+ if (question.audience.indexOf('submitter') !== -1) {
+ submitterAllowed = true;
+ }
- return assessments;
+ if (!submitterAllowed && submissionStatus !== 'published') {
+ accessible = false;
+ }
+
+ return accessible;
}
/**
@@ -223,7 +197,7 @@ export class AssessmentsPage {
*
* @return {Promise
}
*/
- public pullSubmissions(): Promise {
+ pullSubmissions(): Promise {
return new Promise((resolve, reject) => {
// 2nd batch API requests (get_submissions)
Observable.forkJoin(
@@ -231,47 +205,29 @@ export class AssessmentsPage {
this.activity.References
))
.subscribe(allSubmissions => {
- // allSubmissions - response format: [ // context_ids
- // [ // assessment group 1
- // assessment1,
- // assessment2,
- // ...
- // ],
- // [ // assessment group 2
- // assessment1,
- // assessment2,
- // ...
- // ],
- // ...
- // ]
+ /** allSubmissions - response format:
+ * [ // context_ids
+ * [ // assessment group 1
+ * assessment1,
+ * assessment2,
+ * ...
+ * ],
+ * [ // assessment group 2
+ * assessment1,
+ * assessment2,
+ * ...
+ * ],
+ * ...
+ * ]
+ */
let submissions = [];
_.forEach(allSubmissions, group => {
- _.forEach(group, (submission) => {
+ _.forEach(group, submission => {
submissions.push(this.submissionService.normalise(submission));
});
});
- // check if a submission is specified
- let currentSubmission = this.navParams.get('currentSubmission');
- let filteredSubmissions = [];
-
- submissions.forEach(subm => {
- if (currentSubmission && currentSubmission.id === subm.id) {
- filteredSubmissions.push(subm);
- }
- });
- let hasInProgress = _.find(submissions, {status: 'in progress'}); // 'in progress' never > 1
- let isNew = (!currentSubmission && (filteredSubmissions.length === 0 || !_.isEmpty(hasInProgress)));
-
- if (isNew) { // new submission
- this.submissions = !_.isEmpty(hasInProgress) ? [hasInProgress] : [];
- } else if (!isNew && hasInProgress) { // resume 'in progress'
- filteredSubmissions.push(hasInProgress);
- this.submissions = filteredSubmissions;
- } else if (currentSubmission) { // display current submission
- filteredSubmissions.push(currentSubmission);
- this.submissions = filteredSubmissions;
- }
+ this.submissions = this.filterSubmissions(submissions);
resolve(submissions);
}, (err) => {
console.log('err', err);
@@ -280,37 +236,89 @@ export class AssessmentsPage {
});
}
- loadQuestions(): Promise {
- return new Promise((resolve, reject) => {
+ /**
+ * @description filter submissions data
+ * @param {Array} submissions
+ */
+ filterSubmissions(submissions) {
+ let results = []; // filtered submissions
+
+ // check if a submission is specified (from previous page, from NavParams)
+ let currentSubmission = this.navParams.get('currentSubmission');
+
+ // filteredSubmission: store only submissions related to
+ // currentSubmission (if currentSubmission above exist)
+ let filteredSubmissions = [];
+ submissions.forEach(submission => {
+ if (currentSubmission && currentSubmission.id === submission.id) {
+ filteredSubmissions.push(submission);
+ }
+ });
- // get_assessments request with 'assessment_id' & 'structured'
- let getAssessment = (assessmentId) => {
- return this.assessmentService.getAll({
- assessment_id: assessmentId,
- structured: true
- });
- };
+ // prepare statuses of submissions for different condition filtering (activity & event)
+ // Statuses: `in progress`, `done`
+
+ // "in progress" never > 1 (cuz "_.find" return only 1 found value)
+ let hasInProgress = _.find(submissions, {status: 'in progress'});
+ let isNew = (!currentSubmission && (filteredSubmissions.length === 0 || !_.isEmpty(hasInProgress)));
+ let isDone = _.find(submissions, {status: 'done'}); // "done" for view checkin
+ let isCheckin = (this.navParams.get('event') && isDone);
+
+
+ if (isCheckin) { // on event's view checkin, no status filtering required
+ results = submissions;
+ } else if (isNew) { // on new submission
+ results = !_.isEmpty(hasInProgress) ? [hasInProgress] : [];
+ } else if (!isNew && hasInProgress) { // on resume "in progress"
+ filteredSubmissions.push(hasInProgress);
+ results = filteredSubmissions;
+ } else if (currentSubmission) { // display current submission
+ filteredSubmissions.push(currentSubmission);
+ results = filteredSubmissions;
+ }
- // Congregation of assessment ids to fulfill get_assessments API's param requirement
- let tasks = [];
- _.forEach(this.activity.References, (reference) => {
- if (
- reference.Assessment &&
- reference.Assessment.id
- ) {
- return tasks.push(getAssessment(reference.Assessment.id));
- }
+ return results;
+ }
+
+ /**
+ * @name preStackTasks
+ * @description stack of tasks prepared to handle multiple activity references (ids)
+ */
+ preStackTasks() {
+ // get_assessments request with "assessment_id" & "structured"
+ let getAssessment = (assessmentId) => {
+ // @TODO: we might need to pass in submission id (if available) to get properly filtered assessmnet questions
+ return this.assessmentService.getAll({
+ assessment_id: assessmentId,
+ structured: true
});
+ };
+ let tasks: Array = [];
+ // Congregate assessment ids for rxjs forkJoin (batch API requests)
+ _.forEach(this.activity.References, ref => {
+ if (ref.Assessment && ref.Assessment.id) {
+ tasks.push(getAssessment(ref.Assessment.id));
+ }
+ });
+
+ return tasks;
+ }
+
+ /**
+ * @description loading question from API
+ */
+ loadQuestions(): Promise {
+ return new Promise((resolve, reject) => {
/**
* merging submission into question inside of assessment array objects
* - set question statuses (quantity of total answered)
* - set submission button status
*/
- let preprocessAssessmentSubmission = () => {
+ let preprocessAssessmentSubmission = (assessments) => {
this.assessmentGroups = this.mapSubmissionsToAssessment(
this.submissions,
- this.assessmentGroups
+ assessments
);
// Only allow submit when all required question have answered.
@@ -318,13 +326,10 @@ export class AssessmentsPage {
_.forEach(groups, assessment => {
let groupWithAnswers = 0;
_.forEach(assessment.AssessmentGroup, group => {
- // console.log('group.answeredQuestions', group.answeredQuestions);
- // console.log('group.totalRequiredQuestions', group.totalRequiredQuestions);
if (group.answeredQuestions >= group.totalRequiredQuestions) {
groupWithAnswers += 1;
}
});
- // console.log('groupWithAnswers', groupWithAnswers, _.size(assessment.AssessmentGroup));
if (groupWithAnswers >= _.size(assessment.AssessmentGroup)) {
this.allowSubmit = true;
}
@@ -348,42 +353,39 @@ export class AssessmentsPage {
});
};
- // first batch API requests (get_assessments)
- Observable.forkJoin(tasks)
- .subscribe(
- (assessments: any) => {
- this.assessmentGroups = assessments;
- this.submissions = this.navParams.get('submissions');
+ let setSubmissionAndAssessment = (assessments) => {
+ this.submissions = this.navParams.get('submissions');
- // check if this is from single submission view
- let currentSubmission = this.navParams.get('currentSubmission');
- if (currentSubmission) {
- this.submissions = [currentSubmission];
- }
+ // check if this is from single submission view
+ let currentSubmission = this.navParams.get('currentSubmission');
+ if (currentSubmission) {
+ this.submissions = [currentSubmission];
+ }
- // pull new when submission is updated or currentSubmission is empty
- if (this.submissionUpdated || !currentSubmission) {
- this.pullSubmissions().then(res => {
- preprocessAssessmentSubmission();
- }, err => {
- reject(err);
- });
- this.submissionUpdated = false;
- } else {
- preprocessAssessmentSubmission();
- }
- },
- (err) => {
- console.log('err', err);
+ // pull new when submission is updated or currentSubmission is empty
+ if (this.submissionUpdated || !currentSubmission) {
+ this.pullSubmissions().then(res => {
+ preprocessAssessmentSubmission(assessments);
+ }, err => {
reject(err);
- }
- );
+ });
+ this.submissionUpdated = false;
+ } else {
+ preprocessAssessmentSubmission(assessments);
+ }
+ };
+
+ // first batch API requests (get_assessments)
+ Observable.forkJoin(this.preStackTasks())
+ .subscribe(setSubmissionAndAssessment, err => {
+ reject(err);
+ });
});
}
/**
- * submit answer and change submission status to done
+ * @description submit answer and change submission status to done
*/
doSubmit() {
let loading = this.loadingCtrl.create({
@@ -393,6 +395,8 @@ export class AssessmentsPage {
loading.present().then(() => {
let tasks = [];
_.forEach(this.submissions, (submission) => {
+
+ // @TODO: investigate what causes absent of assessment_id/id/context_id
if (
submission &&
submission.assessment_id &&
@@ -438,9 +442,12 @@ export class AssessmentsPage {
});
}
+ /**
+ * @description Submit anwsers
+ */
clickSubmit() {
const confirm = this.alertCtrl.create({
- title: 'Submit evidence',
+ title: 'Confirm Submission',
message: this.submitConfirmMessage,
buttons: [
{
@@ -460,8 +467,10 @@ export class AssessmentsPage {
confirm.present();
}
- // items popup
- popupAfterSubmit(){
+ /**
+ * @description items popup
+ */
+ popupAfterSubmit() {
const loading = this.loadingCtrl.create({
content: this.loadingMessages
});
@@ -471,7 +480,9 @@ export class AssessmentsPage {
{
text: 'OK',
handler: () => {
- this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
+ // Move to dashboard
+ this.navCtrl.parent.select(0);
+ // this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
}
}
]
@@ -490,64 +501,67 @@ export class AssessmentsPage {
this.gameService.getItems({
character_id: this.getCharacterID
- })
- .subscribe(
- data => {
- this.newItemsData = data.Items;
- _.forEach(data.Items, (element, index) => {
- let id = element.id;
- if(!this.newItemsCount[id]){
- this.newItemsCount[id] = 0;
- }
- this.newItemsCount[id]++;
- });
- // compare with previous get_characters() results and generate final index value array result
- _.forEach(this.newItemsCount, (element, id) => {
- if(!this.initialItemsCount[id]){
- this.totalItems.push({ 'count': element, 'id': id });
- }else {
- let diffCountVal = element - this.initialItemsCount[id];
- if(diffCountVal > 0){
- this.totalItems.push({ 'count': diffCountVal, 'id': id });
+ }).subscribe(
+ data => {
+ this.newItemsData = data.Items;
+ _.forEach(data.Items, (element, index) => {
+ let id = element.id;
+ if(!this.newItemsCount[id]){
+ this.newItemsCount[id] = 0;
+ }
+ this.newItemsCount[id]++;
+ });
+ // compare with previous get_characters() results and generate final index value array result
+ _.forEach(this.newItemsCount, (element, id) => {
+ if(!this.initialItemsCount[id]){
+ this.totalItems.push({ "count": element, "id": id });
+ }else {
+ let diffCountVal = element - this.initialItemsCount[id];
+ if(diffCountVal > 0){
+ this.totalItems.push({ "count": diffCountVal, "id": id });
+ }
+ }
+ });
+ _.forEach(this.totalItems, (element, index) => {
+ element.id = parseInt(element.id);
+ });
+ this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
+ // get the final object with item occurance count value
+ let groupData = _.groupBy(this.totalItems, 'id');
+ if(this.allItemsData.length === 0){
+ this.gotNewItems = false;
+ this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+ loading.onDidDismiss(() => {
+ alert.present(); // redirect to dashboard page
+ });
+ loading.dismiss();
+ } else {
+ _.map(this.allItemsData, (ele) => {
+ this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele))
+ });
+ // display items on dashboard page
+ this.gotNewItems = true;
+ this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+ this.cacheService.setLocal('allNewItems', this.combinedItems);
+ loading.onDidDismiss(() => {
+ this.navCtrl.setRoot(ActivitiesListPage);
+ });
+ loading.dismiss();
}
+ },
+ err => {
+ loading.dismiss().then(() => {
+ console.log("Err: ", err);
+ });
}
- });
-
- _.forEach(this.totalItems, (element, index) => {
- element.id = parseInt(element.id);
- });
-
- this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
- // get the final object with item occurance count value
- let groupData = _.groupBy(this.totalItems, 'id');
- if(this.allItemsData.length === 0){
- this.gotNewItems = false;
- this.cacheService.setLocal('gotNewItems', this.gotNewItems);
- loading.onDidDismiss(() => {
- alert.present(); // redirect to dashboard page
- });
- loading.dismiss();
- } else {
- _.map(this.allItemsData, (ele) => {
- this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele));
- });
- // display items on dashboard page
- this.gotNewItems = true;
- this.cacheService.setLocal('gotNewItems', this.gotNewItems);
- this.cacheService.setLocal('allNewItems', this.combinedItems);
- loading.onDidDismiss(() => {
- this.navCtrl.setRoot(ActivitiesListPage);
- });
- loading.dismiss();
- }
- },
- err => {
- loading.dismiss().then(() => {
- console.log('Err: ', err);
- });
- }
- );
+ );
}
+
+ /**
+ * @description Move to assessment group page
+ * @param {Object} assessment group
+ * @param {Object} activity
+ */
gotoAssessment(assessmentGroup, activity) {
this.navCtrl.push(AssessmentsGroupPage, {
assessmentGroup,
diff --git a/src/pages/assessments/group/assessments-group.html b/src/pages/assessments/group/assessments-group.html
index 43f8bcd9..dc0b3ad5 100644
--- a/src/pages/assessments/group/assessments-group.html
+++ b/src/pages/assessments/group/assessments-group.html
@@ -16,12 +16,13 @@
-
+
{{assessmentGroup.name}}
-
+
@@ -30,43 +31,39 @@
{{assessmentGroup.name}}
*
-
+
-
-
{{ submission | json }}
-