From e3f20a8ccf2a0a5f3e741b0401f53e73a269b4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 17 Sep 2018 12:05:06 +0200
Subject: [PATCH] MOBILE-2058 assign: Show no team and multiple team desc

---
 .../addon-mod-assign-submission.html          | 20 +++++++++++++------
 src/addon/mod/assign/lang/en.json             |  2 ++
 src/app/app.scss                              |  9 +++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
index 61c013a05..931cd164b 100644
--- a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -226,12 +226,20 @@
 
 <!-- Template to render some data regarding the submission status. -->
 <ng-template #submissionStatus>
-    <p *ngIf="assign && assign.teamsubmission && lastAttempt">
-        <span *ngIf="lastAttempt.submissiongroup && lastAttempt.submissiongroupname">{{lastAttempt.submissiongroupname}}</span>
-        <span *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && !lastAttempt.usergroups">{{ 'addon.mod_assign.noteam' | translate }}</span>
-        <span *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups">{{ 'addon.mod_assign.multipleteams' | translate }}</span>
-        <span *ngIf="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">{{ 'addon.mod_assign.defaultteam' | translate }}</span>
-    </p>
+    <ng-container *ngIf="assign && assign.teamsubmission && lastAttempt">
+        <p *ngIf="lastAttempt.submissiongroup && lastAttempt.submissiongroupname">{{lastAttempt.submissiongroupname}}</p>
+        <ng-container *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && (!lastAttempt.usergroups || lastAttempt.usergroups.length <= 0)">
+            <p class="text-danger"><strong>{{ 'addon.mod_assign.noteam' | translate }}</strong></p>
+            <p class="text-danger">{{ 'addon.mod_assign.noteam_desc' | translate }}</p>
+        </ng-container>
+        <ng-container *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups && lastAttempt.usergroups.length > 0">
+            <p class="text-danger"><strong>{{ 'addon.mod_assign.multipleteams' | translate }}</strong></p>
+            <p class="text-danger">{{ 'addon.mod_assign.multipleteams_desc' | translate }}</p>
+        </ng-container>
+        <p *ngIf="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">
+            {{ 'addon.mod_assign.defaultteam' | translate }}
+        </p>
+    </ng-container>
     <ion-badge item-end *ngIf="statusTranslated" [color]="statusColor">
         {{ statusTranslated }}
     </ion-badge>
diff --git a/src/addon/mod/assign/lang/en.json b/src/addon/mod/assign/lang/en.json
index e04437755..35876b24c 100644
--- a/src/addon/mod/assign/lang/en.json
+++ b/src/addon/mod/assign/lang/en.json
@@ -51,12 +51,14 @@
     "markingworkflowstatereadyforrelease": "Ready for release",
     "markingworkflowstatereleased": "Released",
     "multipleteams": "Member of more than one group",
+    "multipleteams_desc": "The assignment requires submission in groups. You are a member of more than one group. To be able to submit you must be a member of only one group. Please contact your teacher to change your group membership.",
     "noattempt": "No attempt",
     "nomoresubmissionsaccepted": "Only allowed for participants who have been granted an extension",
     "noonlinesubmissions": "This assignment does not require you to submit anything online",
     "nosubmission": "Nothing has been submitted for this assignment",
     "notallparticipantsareshown": "Participants who have not made a submission are not shown.",
     "noteam": "Not a member of any group",
+    "noteam_desc": "This assignment requires submission in groups. You are not a member of any group, so you cannot create a submission. Please contact your teacher to be added to a group.",
     "notgraded": "Not graded",
     "numberofdraftsubmissions": "Drafts",
     "numberofparticipants": "Participants",
diff --git a/src/app/app.scss b/src/app/app.scss
index 6019015fe..f1b4e218d 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -936,6 +936,15 @@ ion-app.app-root {
   }
 }
 
+@each $color-name, $color-base, $color-contrast in get-colors($colors) {
+  // If there is text with a color it should use this color
+  // and override whatever item sets it to
+  .text-#{$color-name} {
+    color: $color-contrast;
+  }
+}
+
+
 [dir="ltr"] body, [dir="rtl"] body {
   padding-top: constant(safe-area-inset-top); //for iOS 11.2
   padding-top: env(safe-area-inset-top); //for iOS 11.1