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

MOBILE-2334 assign: Fix styles

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2018-04-25 12:25:40 +02:00 committed by Dani Palou
parent 602312e621
commit 6ca648c46d
7 changed files with 213 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addon/mod/assign/components/index/index.html
View File

@ -14,10 +14,9 @@
<core-loading [hideUntil]="loaded" class="core-loading-center"> <core-loading [hideUntil]="loaded" class="core-loading-center">
<!-- Description and intro attachments. --> <!-- Description and intro attachments. -->
<ion-card *ngIf="description"> <ion-card *ngIf="description" (click)="expandDescription($event)">
<ion-item text-wrap> <ion-item text-wrap>
<core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" (click)="expandDescription($event)"></core-format-text> <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" (click)="expandDescription($event)"></core-format-text>
<ion-note *ngIf="note" item-end>{{ note }}</ion-note>
</ion-item> </ion-item>
</ion-card> </ion-card>

336
src/addon/mod/assign/components/submission/submission.html
View File

@ -26,205 +26,199 @@
<!-- View the submission tab. --> <!-- View the submission tab. -->
<core-tab [title]="'addon.mod_assign.submission' | translate"> <core-tab [title]="'addon.mod_assign.submission' | translate">
<ng-template> <ng-template>
<ion-content> <addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign" [submission]="userSubmission" [plugin]="plugin"></addon-mod-assign-submission-plugin>
<addon-mod-assign-submission-plugin *ngFor="let plugin of submissionPlugins" [assign]="assign" [submission]="userSubmission" [plugin]="plugin"></addon-mod-assign-submission-plugin>
<!-- Render some data about the submission. --> <!-- Render some data about the submission. -->
<ion-item text-wrap *ngIf="userSubmission && userSubmission.status != statusNew && userSubmission.timemodified"> <ion-item text-wrap *ngIf="userSubmission && userSubmission.status != statusNew && userSubmission.timemodified">
<h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2> <h2>{{ 'addon.mod_assign.timemodified' | translate }}</h2>
<p>{{ userSubmission.timemodified * 1000 | coreFormatDate:"dfmediumdate" }}</p> <p>{{ userSubmission.timemodified * 1000 | coreFormatDate:"dfmediumdate" }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]"> <ion-item text-wrap *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]">
<h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2> <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
<p><core-format-text [text]="timeRemaining"></core-format-text></p> <p><core-format-text [text]="timeRemaining"></core-format-text></p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="fromDate && !isSubmittedForGrading"> <ion-item text-wrap *ngIf="fromDate && !isSubmittedForGrading">
<p *ngIf="assign.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}"></p> <p *ngIf="assign.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsfromdatesummary' | translate: {'$a': fromDate}"></p>
<p *ngIf="!assign.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate: {'$a': fromDate}"></p> <p *ngIf="!assign.intro" [innerHTML]="'addon.mod_assign.allowsubmissionsanddescriptionfromdatesummary' | translate: {'$a': fromDate}"></p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="assign.duedate && !isSubmittedForGrading"> <ion-item text-wrap *ngIf="assign.duedate && !isSubmittedForGrading">
<h2>{{ 'addon.mod_assign.duedate' | translate }}</h2> <h2>{{ 'addon.mod_assign.duedate' | translate }}</h2>
<p *ngIf="assign.duedate" >{{ assign.duedate * 1000 | coreFormatDate:"dfmediumdate" }}</p> <p *ngIf="assign.duedate" >{{ assign.duedate * 1000 | coreFormatDate:"dfmediumdate" }}</p>
<p *ngIf="!assign.duedate" >{{ 'addon.mod_assign.duedateno' | translate }}</p> <p *ngIf="!assign.duedate" >{{ 'addon.mod_assign.duedateno' | translate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="assign.duedate && assign.cutoffdate && isSubmittedForGrading"> <ion-item text-wrap *ngIf="assign.duedate && assign.cutoffdate && isSubmittedForGrading">
<h2>{{ 'addon.mod_assign.cutoffdate' | translate }}</h2> <h2>{{ 'addon.mod_assign.cutoffdate' | translate }}</h2>
<p>{{ assign.cutoffdate * 1000 | coreFormatDate:"dfmediumdate" }}</p> <p>{{ assign.cutoffdate * 1000 | coreFormatDate:"dfmediumdate" }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="assign.duedate && lastAttempt && lastAttempt.extensionduedate && !isSubmittedForGrading"> <ion-item text-wrap *ngIf="assign.duedate && lastAttempt && lastAttempt.extensionduedate && !isSubmittedForGrading">
<h2>{{ 'addon.mod_assign.extensionduedate' | translate }}</h2> <h2>{{ 'addon.mod_assign.extensionduedate' | translate }}</h2>
<p>{{ lastAttempt.extensionduedate * 1000 | coreFormatDate:"dfmediumdate" }}</p> <p>{{ lastAttempt.extensionduedate * 1000 | coreFormatDate:"dfmediumdate" }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="currentAttempt && !isGrading"> <ion-item text-wrap *ngIf="currentAttempt && !isGrading">
<h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2> <h2>{{ 'addon.mod_assign.attemptnumber' | translate }}</h2>
<p *ngIf="assign.maxattempts == unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}</p> <p *ngIf="assign.maxattempts == unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}</p>
<p *ngIf="assign.maxattempts != unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': assign.maxattempts} } }}</p> <p *ngIf="assign.maxattempts != unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': assign.maxattempts} } }}</p>
</ion-item> </ion-item>
<!-- Add or edit submission. --> <!-- Add or edit submission. -->
<ion-item text-wrap *ngIf="canEdit"> <ion-item text-wrap *ngIf="canEdit">
<div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit"> <div *ngIf="!unsupportedEditPlugins.length && !showErrorStatementEdit">
<!-- If has offline data, show edit. --> <!-- If has offline data, show edit. -->
<a ion-button block color="primary" *ngIf="hasOffline" (click)="goToEdit()">{{ 'addon.mod_assign.editsubmission' | translate }}</a> <a ion-button block color="primary" *ngIf="hasOffline" (click)="goToEdit()">{{ 'addon.mod_assign.editsubmission' | translate }}</a>
<!-- If no submission or is new, show add submission. --> <!-- If no submission or is new, show add submission. -->
<a ion-button block color="primary" *ngIf="!hasOffline && (!userSubmission || !userSubmission.status || userSubmission.status == statusNew)" (click)="goToEdit()">{{ 'addon.mod_assign.addsubmission' | translate }}</a> <a ion-button block color="primary" *ngIf="!hasOffline && (!userSubmission || !userSubmission.status || userSubmission.status == statusNew)" (click)="goToEdit()">{{ 'addon.mod_assign.addsubmission' | translate }}</a>
<!-- If reopened, show addfromprevious and addnewattempt. --> <!-- If reopened, show addfromprevious and addnewattempt. -->
<ng-container *ngIf="!hasOffline && userSubmission && userSubmission.status == statusReopened"> <ng-container *ngIf="!hasOffline && userSubmission && userSubmission.status == statusReopened">
<a ion-button block color="primary" (click)="copyPrevious()">{{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}</a> <a ion-button block color="primary" (click)="copyPrevious()">{{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}</a>
<a ion-button block color="primary" (click)="goToEdit()">{{ 'addon.mod_assign.addnewattempt' | translate }}</a> <a ion-button block color="primary" (click)="goToEdit()">{{ 'addon.mod_assign.addnewattempt' | translate }}</a>
</ng-container> </ng-container>
<!-- Else show editsubmission. --> <!-- Else show editsubmission. -->
<a ion-button block color="primary" *ngIf="!hasOffline && userSubmission && userSubmission.status && userSubmission.status != statusNew && userSubmission.status != statusReopened" (click)="goToEdit()">{{ 'addon.mod_assign.editsubmission' | translate }}</a> <a ion-button block color="primary" *ngIf="!hasOffline && userSubmission && userSubmission.status && userSubmission.status != statusNew && userSubmission.status != statusReopened" (click)="goToEdit()">{{ 'addon.mod_assign.editsubmission' | translate }}</a>
</div>
<div *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
<p class="core-danger-item">{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
<p class="core-danger-item" *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
</div>
<div *ngIf="showErrorStatementEdit">
<p class="core-danger-item">{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
</div>
</ion-item>
<!-- Submit for grading form. -->
<div *ngIf="canSubmit">
<ion-item text-wrap *ngIf="submissionStatement">
<ion-label><core-format-text [text]="submissionStatement"></core-format-text></ion-label>
<ion-checkbox item-end name="submissionstatement" [(ngModel)]="submitModel.submissionStatement">
</ion-checkbox>
</ion-item>
<!-- Submit button. -->
<ion-item text-wrap *ngIf="!showErrorStatementSubmit">
<a ion-button block (click)="submitForGrading(submitModel.submissionStatement)">{{ 'addon.mod_assign.submitassignment' | translate }}</a>
<p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
</ion-item>
<!-- Error because we lack submissions statement. -->
<ion-item text-wrap *ngIf="showErrorStatementSubmit">
<p class="core-danger-item">{{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}</p>
</ion-item>
</div> </div>
<div *ngIf="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
<p class="core-danger-item">{{ 'addon.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
<p class="core-danger-item" *ngFor="let name of unsupportedEditPlugins">{{ name }}</p>
</div>
<div *ngIf="showErrorStatementEdit">
<p class="core-danger-item">{{ 'addon.mod_assign.cannoteditduetostatementsubmission' | translate }}</p>
</div>
</ion-item>
<!-- Team members that need to submit it too. --> <!-- Submit for grading form. -->
<ion-item text-wrap *ngIf="membersToSubmit && membersToSubmit.length > 0"> <div *ngIf="canSubmit">
<h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate }}</h2> <ion-item text-wrap *ngIf="submissionStatement">
<div *ngFor="let user of membersToSubmit"> <ion-label><core-format-text [text]="submissionStatement"></core-format-text></ion-label>
<a *ngIf="user.fullname" (click)="openUserProfile(user.id)" [title]="user.fullname"> <ion-checkbox item-end name="submissionstatement" [(ngModel)]="submitModel.submissionStatement">
<ion-avatar item-start> </ion-checkbox>
<img [src]="user.profileimageurl" core-external-content [alt]="'core.pictureof' | translate:{$a: user.fullname}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<h2>{{ user.fullname }}</h2>
</a>
<p *ngIf="!user.fullname">
{{ 'addon.mod_assign.hiddenuser' | translate }} <core-format-text [text]="user"></core-format-text>
</p>
</div>
</ion-item> </ion-item>
<!-- Submit button. -->
<ion-item text-wrap *ngIf="!showErrorStatementSubmit">
<a ion-button block (click)="submitForGrading(submitModel.submissionStatement)">{{ 'addon.mod_assign.submitassignment' | translate }}</a>
<p>{{ 'addon.mod_assign.submitassignment_help' | translate }}</p>
</ion-item>
<!-- Error because we lack submissions statement. -->
<ion-item text-wrap *ngIf="showErrorStatementSubmit">
<p class="core-danger-item">{{ 'addon.mod_assign.cannotsubmitduetostatementsubmission' | translate }}</p>
</ion-item>
</div>
<!-- Submission is locked. --> <!-- Team members that need to submit it too. -->
<ion-item text-wrap *ngIf="lastAttempt && lastAttempt.locked"> <ion-item text-wrap *ngIf="membersToSubmit && membersToSubmit.length > 0">
<h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2> <h2>{{ 'addon.mod_assign.userswhoneedtosubmit' | translate }}</h2>
</ion-item> <div *ngFor="let user of membersToSubmit">
<a *ngIf="user.fullname" (click)="openUserProfile(user.id)" [title]="user.fullname">
<ion-avatar item-start>
<img [src]="user.profileimageurl" core-external-content [alt]="'core.pictureof' | translate:{$a: user.fullname}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
</ion-avatar>
<h2>{{ user.fullname }}</h2>
</a>
<p *ngIf="!user.fullname">
{{ 'addon.mod_assign.hiddenuser' | translate }} <core-format-text [text]="user"></core-format-text>
</p>
</div>
</ion-item>
<!-- Editing status. --> <!-- Submission is locked. -->
<ion-item text-wrap *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt.caneditowner !== undefined" [ngClass]="{submissioneditable: lastAttempt.caneditowner, submissionnoteditable: !lastAttempt.caneditowner}"> <ion-item text-wrap *ngIf="lastAttempt && lastAttempt.locked">
<h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2> <h2>{{ 'addon.mod_assign.submissionslocked' | translate }}</h2>
<p *ngIf="lastAttempt.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p> </ion-item>
<p *ngIf="!lastAttempt.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
</ion-item> <!-- Editing status. -->
</ion-content> <ion-item text-wrap *ngIf="lastAttempt && isSubmittedForGrading && lastAttempt.caneditowner !== undefined" [ngClass]="{submissioneditable: lastAttempt.caneditowner, submissionnoteditable: !lastAttempt.caneditowner}">
<h2>{{ 'addon.mod_assign.editingstatus' | translate }}</h2>
<p *ngIf="lastAttempt.caneditowner">{{ 'addon.mod_assign.submissioneditable' | translate }}</p>
<p *ngIf="!lastAttempt.caneditowner">{{ 'addon.mod_assign.submissionnoteditable' | translate }}</p>
</ion-item>
</ng-template> </ng-template>
</core-tab> </core-tab>
<!-- Grade the submission tab. --> <!-- Grade the submission tab. -->
<core-tab [title]="'addon.mod_assign.grade' | translate" *ngIf="feedback || isGrading"> <core-tab [title]="'addon.mod_assign.grade' | translate" *ngIf="feedback || isGrading">
<ng-template> <ng-template>
<ion-content> <!-- Current grade if method is advanced. -->
<!-- Current grade if method is advanced. --> <ion-item text-wrap *ngIf="feedback.gradefordisplay && (!isGrading || grade.method != 'simple')" class="core-grading-summary">
<ion-item text-wrap *ngIf="feedback.gradefordisplay && (!isGrading || grade.method != 'simple')" class="core-grading-summary"> <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
<h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2> <p><core-format-text [text]="feedback.gradefordisplay"></core-format-text></p>
<p><core-format-text [text]="feedback.gradefordisplay"></core-format-text></p> <a ion-button item-end icon-only *ngIf="feedback.advancedgrade" (click)="showAdvancedGrade()">
<a ion-button item-end icon-only *ngIf="feedback.advancedgrade" (click)="showAdvancedGrade()"> <ion-icon name="search"></ion-icon>
<ion-icon name="search"></ion-icon> </a>
</a> </ion-item>
</ion-item>
<!-- Numeric grade. --> <!-- Numeric grade. -->
<ion-item text-wrap *ngIf="grade.method == 'simple' && !grade.scale"> <ion-item text-wrap *ngIf="grade.method == 'simple' && !grade.scale">
<ion-label stacked>{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo.grade} }}</ion-label> <ion-label stacked>{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo.grade} }}</ion-label>
<ion-input type="number" [(ngModel)]="grade.grade" min="0" [max]="gradeInfo.grade" [lang]="grade.lang" core-input-errors></ion-input> <ion-input type="number" [(ngModel)]="grade.grade" min="0" [max]="gradeInfo.grade" [lang]="grade.lang" core-input-errors></ion-input>
</ion-item> </ion-item>
<!-- Grade using a scale. --> <!-- Grade using a scale. -->
<ion-item text-wrap *ngIf="grade.method == 'simple' && grade.scale"> <ion-item text-wrap *ngIf="grade.method == 'simple' && grade.scale">
<ion-label>{{ 'addon.mod_assign.grade' | translate }}</ion-label> <ion-label>{{ 'addon.mod_assign.grade' | translate }}</ion-label>
<ion-select [(ngModel)]="grade.grade" interface="popover"> <ion-select [(ngModel)]="grade.grade" interface="popover">
<ion-option *ngFor="let grade of grade.scale" [value]="grade.value">{{grade.label}}</ion-option> <ion-option *ngFor="let grade of grade.scale" [value]="grade.value">{{grade.label}}</ion-option>
</ion-select> </ion-select>
</ion-item> </ion-item>
<!-- Outcomes. --> <!-- Outcomes. -->
<ion-item text-wrap *ngFor="let outcome of gradeInfo.outcomes"> <ion-item text-wrap *ngFor="let outcome of gradeInfo.outcomes">
<ion-label>{{ outcome.name }}</ion-label> <ion-label>{{ outcome.name }}</ion-label>
<ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId" interface="popover"> <ion-select *ngIf="canSaveGrades && outcome.itemNumber" [(ngModel)]="outcome.selectedId" interface="popover">
<ion-option *ngFor="let grade of outcome.options" [value]="grade.value">{{grade.label}}</ion-option> <ion-option *ngFor="let grade of outcome.options" [value]="grade.value">{{grade.label}}</ion-option>
</ion-select> </ion-select>
<p item-content *ngIf="!canSaveGrades || !outcome.itemNumber">{{ outcome.selected }}</p> <p item-content *ngIf="!canSaveGrades || !outcome.itemNumber">{{ outcome.selected }}</p>
</ion-item> </ion-item>
<addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback.plugins" [assign]="assign" [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades"></addon-mod-assign-feedback-plugin> <addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback.plugins" [assign]="assign" [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades"></addon-mod-assign-feedback-plugin>
<!-- Workflow status. --> <!-- Workflow status. -->
<ion-item text-wrap *ngIf="workflowStatusTranslationId"> <ion-item text-wrap *ngIf="workflowStatusTranslationId">
<h2>{{ 'addon.mod_assign.markingworkflowstate' | translate }}</h2> <h2>{{ 'addon.mod_assign.markingworkflowstate' | translate }}</h2>
<p>{{ workflowStatusTranslationId | translate }}</p> <p>{{ workflowStatusTranslationId | translate }}</p>
</ion-item> </ion-item>
<!--- Apply grade to all team members. --> <!--- Apply grade to all team members. -->
<ion-item text-wrap *ngIf="assign.teamsubmission && canSaveGrades"> <ion-item text-wrap *ngIf="assign.teamsubmission && canSaveGrades">
<h2>{{ 'addon.mod_assign.groupsubmissionsettings' | translate }}</h2> <h2>{{ 'addon.mod_assign.groupsubmissionsettings' | translate }}</h2>
<ion-label>{{ 'addon.mod_assign.applytoteam' | translate }}</ion-label> <ion-label>{{ 'addon.mod_assign.applytoteam' | translate }}</ion-label>
<ion-toggle [(ngModel)]="grade.applyToAll"></ion-toggle> <ion-toggle [(ngModel)]="grade.applyToAll"></ion-toggle>
</ion-item> </ion-item>
<!-- Attempt status. --> <!-- Attempt status. -->
<ion-item text-wrap *ngIf="isGrading && assign.attemptreopenmethod != attemptReopenMethodNone"> <ion-item text-wrap *ngIf="isGrading && assign.attemptreopenmethod != attemptReopenMethodNone">
<h2>{{ 'addon.mod_assign.attemptsettings' | translate }}</h2> <h2>{{ 'addon.mod_assign.attemptsettings' | translate }}</h2>
<p *ngIf="assign.maxattempts == unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}</p> <p *ngIf="assign.maxattempts == unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': maxAttemptsText} } }}</p>
<p *ngIf="assign.maxattempts != unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': assign.maxattempts} } }}</p> <p *ngIf="assign.maxattempts != unlimitedAttempts">{{ 'addon.mod_assign.outof' | translate : {'$a': {'current': currentAttempt, 'total': assign.maxattempts} } }}</p>
<p>{{ 'addon.mod_assign.attemptreopenmethod' | translate }}: {{ 'addon.mod_assign.attemptreopenmethod_' + assign.attemptreopenmethod | translate }}</p> <p>{{ 'addon.mod_assign.attemptreopenmethod' | translate }}: {{ 'addon.mod_assign.attemptreopenmethod_' + assign.attemptreopenmethod | translate }}</p>
<ng-container *ngIf="canSaveGrades && allowAddAttempt" > <ng-container *ngIf="canSaveGrades && allowAddAttempt" >
<ion-label>{{ 'addon.mod_assign.addattempt' | translate }}</ion-label> <ion-label>{{ 'addon.mod_assign.addattempt' | translate }}</ion-label>
<ion-toggle [(ngModel)]="grade.addAttempt"></ion-toggle> <ion-toggle [(ngModel)]="grade.addAttempt"></ion-toggle>
</ng-container> </ng-container>
</ion-item> </ion-item>
<!-- Data about the grader (teacher who graded). --> <!-- Data about the grader (teacher who graded). -->
<ion-item text-wrap *ngIf="grader"> <ion-item text-wrap *ngIf="grader" (click)="openUserProfile(grader.id)" [title]="grader.fullname" detail-push>
<h2>{{ 'addon.mod_assign.gradedby' | translate }}</h2> <ion-avatar item-start>
<a (click)="openUserProfile(grader.id)" [title]="grader.fullname"> <img [src]="grader.profileimageurl" core-external-content [alt]="'core.pictureof' | translate:{$a: grader.fullname}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
<ion-avatar item-start> </ion-avatar>
<img [src]="grader.profileimageurl" core-external-content [alt]="'core.pictureof' | translate:{$a: grader.fullname}" role="presentation" onError="this.src='assets/img/user-avatar.png'"> <h2>{{ 'addon.mod_assign.gradedby' | translate }}</h2>
</ion-avatar> <h2>{{ grader.fullname }}</h2>
<h2>{{ grader.fullname }}</h2> <p *ngIf="feedback.gradeddate">{{ feedback.gradeddate * 1000 | coreFormatDate:"dfmediumdate" }}</p>
<p *ngIf="feedback.gradeddate">{{ feedback.gradeddate * 1000 | coreFormatDate:"dfmediumdate" }}</p> </ion-item>
</a>
</ion-item>
<!-- Warning message if cannot save grades. --> <!-- Warning message if cannot save grades. -->
<div *ngIf="isGrading && !canSaveGrades" class="core-warning-card" icon-start> <div *ngIf="isGrading && !canSaveGrades" class="core-warning-card" icon-start>
<ion-icon name="warning"></ion-icon> <ion-icon name="warning"></ion-icon>
<p>{{ 'addon.mod_assign.cannotgradefromapp' | translate:{$a: moduleName} }}</p> <p>{{ 'addon.mod_assign.cannotgradefromapp' | translate:{$a: moduleName} }}</p>
<a ion-button block *ngIf="gradeUrl" [href]="gradeUrl" core-link icon-end> <a ion-button block *ngIf="gradeUrl" [href]="gradeUrl" core-link icon-end>
{{ 'core.openinbrowser' | translate }} {{ 'core.openinbrowser' | translate }}
<ion-icon name="open"></ion-icon> <ion-icon name="open"></ion-icon>
</a> </a>
</div> </div>
</ion-content>
</ng-template> </ng-template>
</core-tab> </core-tab>
</core-tabs> </core-tabs>

6
src/addon/mod/assign/feedback/comments/component/comments.html
View File

@ -6,11 +6,11 @@
</p> </p>
<div item-end> <div item-end>
<div text-right> <div text-right>
<a ion-button *ngIf="canEdit" (click)="editComment()" color="light"> <button ion-button icon-only clear *ngIf="canEdit" (click)="editComment()" color="dark">
<ion-icon name="create"></ion-icon> <ion-icon name="create"></ion-icon>
</a> </button>
</div> </div>
<ion-note *ngIf="!isSent"> <ion-note *ngIf="!isSent" color="dark">
<ion-icon name="clock"></ion-icon> <ion-icon name="clock"></ion-icon>
{{ 'core.notsent' | translate }} {{ 'core.notsent' | translate }}
</ion-note> </ion-note>

2
src/addon/mod/assign/providers/assign.ts
View File

@ -488,7 +488,7 @@ export class AddonModAssignProvider {
case 'nosubmission': case 'nosubmission':
return 'danger'; return 'danger';
default: default:
return ''; return 'light';
} }
} }

11
src/components/file/file.scss
View File

@ -1,2 +1,11 @@
core-file { .card-md core-file + core-file > .item-md.item-block > .item-inner {
border-top: 1px solid $list-md-border-color;
}
.card-ios core-file + core-file > .item-ios.item-block > .item-inner {
border-top: $hairlines-width solid $list-ios-border-color;
}
.card-wp core-file + core-file > .item-wp.item-block > .item-inner {
border-top: 1px solid $list-wp-border-color;
} }

49
src/components/local-file/local-file.html
View File

@ -1,29 +1,28 @@
<a ion-item text-wrap class="item-media" (click)="fileClicked($event)" detail-none> <form (ngSubmit)="changeName(newFileName, $event)">
<img [src]="fileIcon" alt="{{fileExtension}}" role="presentation" item-start /> <a ion-item text-wrap stacked class="item-media" [class.item-input]="editMode" (click)="fileClicked($event)" detail-none>
<img [src]="fileIcon" alt="{{fileExtension}}" role="presentation" item-start />
<!-- File name and edit button (if editable). --> <!-- File name and edit button (if editable). -->
<p *ngIf="!editMode" class="core-text-with-icon-right"> <h2 *ngIf="!editMode">{{fileName}}</h2>
{{fileName}} <!-- More data about the file. -->
<a ion-button icon-only clear *ngIf="manage" (click)="activateEdit($event)" [attr.aria-label]="'core.edit' | translate"> <p *ngIf="size && !editMode">{{ size }}</p>
<ion-icon name="create" ios="md-create"></ion-icon> <p *ngIf="timemodified && !editMode">{{ timemodified }}</p>
</a>
</p>
<!-- Form to edit the file's name. --> <!-- Form to edit the file's name. -->
<form *ngIf="editMode" (ngSubmit)="changeName(newFileName)"> <ion-input type="text" name="filename" [placeholder]="'core.filename' | translate" autocapitalize="none" autocorrect="off" (click)="$event.stopPropagation()" [core-auto-focus] [(ngModel)]="newFileName" *ngIf="editMode"></ion-input>
<ion-input type="text" name="filename" [(ngModel)]="newFileName" [placeholder]="'core.filename' | translate" autocapitalize="none" autocorrect="off" (click)="$event.stopPropagation()" [core-auto-focus]></ion-input>
<button type="submit" ion-button icon-only clear class="core-button-icon-small" [attr.aria-label]="'core.save' | translate">
<ion-icon name="checkmark"></ion-icon>
</button>
</form>
<!-- More data about the file. --> <div class="buttons" item-end *ngIf="manage">
<p *ngIf="size">{{ size }}</p> <button *ngIf="!editMode" ion-button icon-only clear (click)="activateEdit($event)" [attr.aria-label]="'core.edit' | translate" color="dark">
<p *ngIf="timemodified">{{ timemodified }}</p> <ion-icon name="create" ios="md-create"></ion-icon>
</button>
<div class="buttons" item-end *ngIf="manage"> <button *ngIf="editMode" ion-button icon-only clear [attr.aria-label]="'core.save' | translate" color="success" type="submit">
<button ion-button clear icon-only (click)="deleteFile($event)" [attr.aria-label]="'core.delete' | translate" color="danger"> <ion-icon name="checkmark"></ion-icon>
<ion-icon name="trash"></ion-icon> </button>
</button>
</div> <button ion-button clear icon-only (click)="deleteFile($event)" [attr.aria-label]="'core.delete' | translate" color="danger">
</a> <ion-icon name="trash"></ion-icon>
</button>
</div>
</a>
</form>

10
src/components/local-file/local-file.ts
View File

@ -96,6 +96,10 @@ export class CoreLocalFileComponent implements OnInit {
* @param {Event} e Click event. * @param {Event} e Click event.
*/ */
fileClicked(e: Event): void { fileClicked(e: Event): void {
if (this.editMode) {
return;
}
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -127,8 +131,12 @@ export class CoreLocalFileComponent implements OnInit {
* Rename the file. * Rename the file.
* *
* @param {string} newName New name. * @param {string} newName New name.
* @param {Event} e Click event.
*/ */
changeName(newName: string): void { changeName(newName: string, e: Event): void {
e.preventDefault();
e.stopPropagation();
if (newName == this.file.name) { if (newName == this.file.name) {
// Name hasn't changed, stop. // Name hasn't changed, stop.
this.editMode = false; this.editMode = false;