Merge branch '7.0.x' into development

Author: macite

CHANGELOG.md

@@ -327,8 +327,17 @@ All notable changes to this project will be documented in this file. See [standa
 * remove unused loading from f-units ([c4c38fa](https://github.com/macite/doubtfire-deploy/commit/c4c38fad4fbdfe248e383cf247f949197ad0a047))
 * use tailwindcss classes ([8d7e160](https://github.com/macite/doubtfire-deploy/commit/8d7e160e2d40c42284ee0c1fc85d6d9e01166cda))
 
-### [7.0.22](https://github.com/macite/doubtfire-deploy/compare/v7.0.21...v7.0.22) (2024-05-31)
 
+### [7.0.23](https://github.com/macite/doubtfire-deploy/compare/v7.0.22...v7.0.23) (2024-06-04)
+
+
+### Bug Fixes
+
+* tidy up portfolio marking page to avoid save issues ([58d091f](https://github.com/macite/doubtfire-deploy/commit/58d091fe52e108a6063907b3b486ff14648862d1))
+* update entity service to correct portfolio progress load ([96cd698](https://github.com/macite/doubtfire-deploy/commit/96cd6984073b689adcc85207ce54913a07f5c5f1))
+
+
+### [7.0.22](https://github.com/macite/doubtfire-deploy/compare/v7.0.21...v7.0.22) (2024-05-31)
 
 ### Features
 

package-lock.json

@@ -82,7 +82,7 @@
     "ng-flex-layout": "^17.3.4-beta.1",
     "ng2-pdf-viewer": "^10.0",
     "ngx-bootstrap": "^6.1.0",
-    "ngx-entity-service": "^0.0.38",
+    "ngx-entity-service": "^0.0.39",
     "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
     "rxjs": "~7.4.0",

package.json

@@ -249,31 +249,7 @@ <h4 class="panel-title">Grade for {{selectedStudent.student.name}}</h4>
       </div>
       <div class="panel-body alignment-rater">
         <div class="col-sm-12 rationale-wrapper">
-          <div
-            tooltip="Click to edit rationale"
-            tooltip-placement="left"
-            tooltip-append-to-body="false"
-            tooltip-popup-delay="300"
-            tooltip-enable="project.gradeRationale != null"
-            ng-click="toggleEditRationale()"
-            class="rationale"
-            ng-class="{'no-rationale': project.gradeRationale == null}"
-            ng-hide="editingRationale"
-          >
-            <label class="text-muted" ng-show="project.gradeRationale != null"> Provided Rationale </label>
-            <div ng-bind-html="(project.gradeRationale || 'No rationale provided') | markdown | to_trusted"></div>
-            <div class="small" ng-hide="project.gradeRationale">Click to add one</div>
-          </div>
-          <div ng-if="editingRationale" class="clearfix">
-            <div
-              contenteditable
-              ng-model="project.gradeRationale"
-              placeholder="Edit rationale here..."
-              style="border-style: solid; border-width: thin; height: 200px"
-            ></div>
-            <a ng-click="toggleEditRationale(alignment)" class="pull-right">Done Editing</a>
-          </div>
-          {{project.gradeRationale}}
+          <textarea id="gradeRationale" style="height: 160px" class="form-control" ng-model="project.gradeRationale"></textarea>
         </div>
 
         <div ng-repeat="results in gradeResults">
@@ -282,12 +258,16 @@ <h5 class="col-sm-2">{{results.name}}</h5>
             <label
               ng-repeat="resultScore in results.scores"
               ng-click="project.assignGrade(resultScore, project.gradeRationale)"
+              ng-disabled="!project.gradeRationale"
               class="btn col-sm-2 text-center {{project.grade == resultScore ? 'btn-primary' : 'btn-default'}}"
             >
               {{resultScore}}
             </label>
           </p>
         </div>
+        <div>
+          <button class="btn btn-primary pull-right col-md-3" ng-click="project.assignGrade(project.grade, project.gradeRationale)" ng-disabled="!project.gradeRationale">Save</button>
+        </div>
       </div>
     </div>
   </div>