-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2348 from WISE-Community/issue-2318-notebook-grad…
…ing-redesign Notebook grading redesign
- Loading branch information
Showing
43 changed files
with
907 additions
and
732 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
182 changes: 97 additions & 85 deletions
182
...ssroomMonitor/classroomMonitorComponents/nodeGrading/nodeGradingView/nodeGradingView.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,99 @@ | ||
| <div class="l-constrained grading"> | ||
| <div ng-if="!$ctrl.componentId" | ||
| class="flex md-subhead content-head" | ||
| layout="row" | ||
| layout-align="center center" | ||
| layout-align-gt-sm="start center" | ||
| layout-wrap> | ||
| <div layout="row" layout-align="center center" layout-wrap flex-xs="100" flex-sm="100"> | ||
| <div class="accent-2" layout="row" layout-align="center center"> | ||
| <h2 class="content-head__item">{{$ctrl.getNodeCompletion($ctrl.nodeId)}}%<span class="md-subhead" translate="completion"></span></h2> | ||
| <h2 class="content-head__item" ng-if="$ctrl.nodeHasWork">{{$ctrl.getNodeAverageScore()}}<span class="md-subhead" translate="meanScore"></span></h2> | ||
| </div> | ||
| </div> | ||
| <span flex></span> | ||
| <div class="content-head__more" layout="row" layout-align="center center"> | ||
| <component-select node-id="{{ ::$ctrl.nodeId }}" | ||
| custom-class="'md-no-underline md-button'" | ||
| on-change="$ctrl.onUpdateHiddenComponents(value)"></component-select> | ||
| <md-button ng-if="$ctrl.milestoneReport" | ||
| ng-click="$ctrl.showReport($event)" | ||
| class="md-raised info"> | ||
| <md-icon class="info"> flag </md-icon> | ||
| <span>{{ ::'REPORT' | translate }}</span> | ||
| </md-button> | ||
| <md-button ng-click="$ctrl.showRubric($event)" | ||
| class="md-raised info"> | ||
| <md-icon class="info"> info_outline </md-icon> | ||
| <span ng-if="!$ctrl.numRubrics">{{ ::'STEP_INFO' | translate }}</span> | ||
| <span ng-if="$ctrl.numRubrics">{{ ::'infoTipsLabel' | translate:{numberOfTips: $ctrl.numRubrics} }}</span> | ||
| </md-button> | ||
| </div> | ||
| <div ng-if="!$ctrl.componentId" class="flex md-subhead content-head" layout="row" | ||
| layout-align="center center" layout-align-gt-sm="start center" layout-wrap> | ||
| <div layout="row" layout-align="center center" layout-wrap flex-xs="100" flex-sm="100"> | ||
| <div class="accent-2" layout="row" layout-align="center center"> | ||
| <h2 class="content-head__item"> | ||
| {{$ctrl.getNodeCompletion($ctrl.nodeId)}}%<span class="md-subhead" translate="completion"></span> | ||
| </h2> | ||
| <h2 class="content-head__item" ng-if="$ctrl.nodeHasWork"> | ||
| {{$ctrl.getNodeAverageScore()}}<span class="md-subhead" translate="meanScore"></span> | ||
| </h2> | ||
| </div> | ||
| </div> | ||
| <md-list class="user-list"> | ||
| <md-list-item class="md-whiteframe-1dp md-with-secondary list-item list-item--actions" layout-wrap> | ||
| <div flex-xs="100" flex-sm="100"> | ||
| <workgroup-select by-student="true" | ||
| custom-class="'autocomplete--flat autocomplete--minwidth'" | ||
| use-autocomplete="true"></workgroup-select> | ||
| </div> | ||
| <span flex hide-xs hide-sm></span> | ||
| <div class="md-secondary-container" ng-if="$ctrl.nodeHasWork" | ||
| flex-xs="100" flex-sm="100" layout-column layout-align="center center"> | ||
| <md-button aria-label="{{ ::'expandAllLabel' | translate }}" | ||
| class="button--small md-primary" | ||
| ng-click="$ctrl.expandAll()">{{ ::'expandAll' | translate }}</md-button> | ||
| <md-button aria-label="{{ ::'collapseAllLabel' | translate }}" | ||
| class="button--small md-primary" | ||
| ng-click="$ctrl.collapseAll()">{{ ::'collapseAll' | translate }}</md-button> | ||
| </div> | ||
| <div ng-if="!$ctrl.nodeHasWork" class="center md-padding" flex-xs="100" flex-sm="100"> | ||
| <span class="text-secondary md-caption" translate="stepNoCaptureWork"></span> | ||
| </div> | ||
| </md-list-item> | ||
| <md-list-item class="table--list__thead table--list__thead__th md-whiteframe-1dp"> | ||
| <div class="md-list-item-text table--list__thead__tr" layout="row" flex> | ||
| <md-button class="table--list__thead__link" flex layout="row" layout-align="start center" | ||
| ng-click="$ctrl.setSort('team')" aria-label="{{::'sortByTeam' | translate}}"> | ||
| <span translate="team"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'team' || $ctrl.sort === '-team'" class="text-light table--list__thead__sort" ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-team'}"> arrow_drop_up </md-icon> | ||
| </md-button> | ||
| <md-button class="table--list__thead__link" flex="{{$ctrl.nodeHasWork ? 30 : 20}}" layout="row" layout-align="center center" | ||
| ng-click="$ctrl.setSort('status')" aria-label="{{::'sortByCompletion' | translate}}"> | ||
| <span translate="status"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'status' || $ctrl.sort === '-status'" class="text-light table--list__thead__sort" ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-status'}"> arrow_drop_up </md-icon> | ||
| </md-button> | ||
| <!--<div flex="20" layout="row" layout-align="center center">Time Spent</div>--> | ||
| <md-button class="table--list__thead__link" ng-if="$ctrl.nodeHasWork" flex="20" layout="row" layout-align="center center" | ||
| ng-click="$ctrl.setSort('score')" aria-label="{{::'sortByScore' | translate}}"> | ||
| <span translate="score"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'score' || $ctrl.sort === '-score'" class="text-light table--list__thead__sort" ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-score'}"> arrow_drop_up </md-icon> | ||
| </md-button> | ||
| </div> | ||
| </md-list-item> | ||
| <workgroup-item ng-repeat="workgroup in $ctrl.workgroupsById | toArray | orderBy:$ctrl.getOrderBy()" | ||
| ng-if="$ctrl.isWorkgroupShown(workgroup.$key)" | ||
| expand="$ctrl.workVisibilityById[workgroup.$key]" | ||
| max-score="$ctrl.maxScore" | ||
| show-score="$ctrl.nodeHasWork" | ||
| node-id="$ctrl.nodeId" | ||
| component-id="$ctrl.componentId" | ||
| workgroup-id="workgroup.$key" | ||
| workgroup-data="workgroup" | ||
| hidden-components="$ctrl.hiddenComponents" | ||
| on-update-expand="$ctrl.onUpdateExpand(workgroupId, value)" | ||
| in-view="$ctrl.workgroupInView(workgroup.$key, $inview)"></workgroup-item> | ||
| </md-list> | ||
| </div> | ||
| <span flex></span> | ||
| <div class="content-head__more" layout="row" layout-align="center center"> | ||
| <component-select node-id="{{ ::$ctrl.nodeId }}" custom-class="'md-no-underline md-button'" | ||
| on-change="$ctrl.onUpdateHiddenComponents(value)"></component-select> | ||
| <md-button ng-if="$ctrl.milestoneReport" ng-click="$ctrl.showReport($event)" | ||
| class="md-raised info"> | ||
| <md-icon class="info"> flag </md-icon> | ||
| <span>{{ ::'REPORT' | translate }}</span> | ||
| </md-button> | ||
| <md-button ng-click="$ctrl.showRubric($event)" class="md-raised info"> | ||
| <md-icon class="info"> info_outline </md-icon> | ||
| <span ng-if="!$ctrl.numRubrics">{{ ::'STEP_INFO' | translate }}</span> | ||
| <span ng-if="$ctrl.numRubrics"> | ||
| {{ ::'infoTipsLabel' | translate:{numberOfTips: $ctrl.numRubrics} }} | ||
| </span> | ||
| </md-button> | ||
| </div> | ||
| </div> | ||
| <md-list class="user-list"> | ||
| <md-list-item class="md-whiteframe-1dp md-with-secondary list-item list-item--actions" | ||
| layout-wrap> | ||
| <div flex-xs="100" flex-sm="100"> | ||
| <workgroup-select by-student="true" | ||
| custom-class="'autocomplete--flat autocomplete--minwidth'" | ||
| use-autocomplete="true"></workgroup-select> | ||
| </div> | ||
| <span flex hide-xs hide-sm></span> | ||
| <div class="md-secondary-container" ng-if="$ctrl.nodeHasWork" flex-xs="100" flex-sm="100" | ||
| layout-column layout-align="center center"> | ||
| <md-button aria-label="{{ ::'expandAllLabel' | translate }}" | ||
| class="button--small md-primary" ng-click="$ctrl.expandAll()"> | ||
| {{ ::'expandAll' | translate }} | ||
| </md-button> | ||
| <md-button aria-label="{{ ::'collapseAllLabel' | translate }}" | ||
| class="button--small md-primary" ng-click="$ctrl.collapseAll()"> | ||
| {{ ::'collapseAll' | translate }} | ||
| </md-button> | ||
| </div> | ||
| <div ng-if="!$ctrl.nodeHasWork" class="center md-padding" flex-xs="100" flex-sm="100"> | ||
| <span class="text-secondary md-caption" translate="stepNoCaptureWork"></span> | ||
| </div> | ||
| </md-list-item> | ||
| <md-list-item class="table--list__thead table--list__thead__th md-whiteframe-1dp"> | ||
| <div class="md-list-item-text table--list__thead__tr" layout="row" flex> | ||
| <md-button class="table--list__thead__link" flex layout="row" layout-align="start center" | ||
| ng-click="$ctrl.setSort('team')" aria-label="{{::'sortByTeam' | translate}}"> | ||
| <span translate="team"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'team' || $ctrl.sort === '-team'" | ||
| class="text-light table--list__thead__sort" md-theme="default" | ||
| ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-team'}"> | ||
| arrow_drop_up | ||
| </md-icon> | ||
| </md-button> | ||
| <md-button class="table--list__thead__link" flex="{{$ctrl.nodeHasWork ? 30 : 20}}" | ||
| layout="row" layout-align="center center" ng-click="$ctrl.setSort('status')" | ||
| aria-label="{{::'sortByCompletion' | translate}}"> | ||
| <span translate="status"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'status' || $ctrl.sort === '-status'" | ||
| class="text-light table--list__thead__sort" md-theme="default" | ||
| ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-status'}"> | ||
| arrow_drop_up | ||
| </md-icon> | ||
| </md-button> | ||
| <!--<div flex="20" layout="row" layout-align="center center">Time Spent</div>--> | ||
| <md-button class="table--list__thead__link" ng-if="$ctrl.nodeHasWork" flex="20" layout="row" | ||
| layout-align="center center" ng-click="$ctrl.setSort('score')" | ||
| aria-label="{{::'sortByScore' | translate}}"> | ||
| <span translate="score"></span> | ||
| <md-icon ng-if="$ctrl.sort === 'score' || $ctrl.sort === '-score'" | ||
| class="text-light table--list__thead__sort" md-theme="default" | ||
| ng-class="{'table--list__thead__sort--reverse': $ctrl.sort === '-score'}"> | ||
| arrow_drop_up | ||
| </md-icon> | ||
| </md-button> | ||
| </div> | ||
| </md-list-item> | ||
| <workgroup-item ng-repeat="workgroup in $ctrl.workgroupsById | toArray | orderBy:$ctrl.getOrderBy()" | ||
| ng-if="$ctrl.isWorkgroupShown(workgroup)" | ||
| expand="$ctrl.workVisibilityById[workgroup.$key]" max-score="$ctrl.maxScore" | ||
| show-score="$ctrl.nodeHasWork" node-id="$ctrl.nodeId" | ||
| component-id="$ctrl.componentId" workgroup-id="workgroup.$key" | ||
| workgroup-data="workgroup" hidden-components="$ctrl.hiddenComponents" | ||
| on-update-expand="$ctrl.onUpdateExpand(workgroupId, value)" | ||
| in-view="$ctrl.workgroupInView(workgroup.$key, $inview)"></workgroup-item> | ||
| </md-list> | ||
| </div> |
Oops, something went wrong.