Fix merge conflicts.

course_grader_vue/components/graderoster/grade/input.vue

@@ -0,0 +1,16 @@
+<template>
+  <div>
+    Not implemented
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    student: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>

course_grader_vue/components/graderoster/grade/static.vue

@@ -0,0 +1,43 @@
+<template>
+  <div v-if="student.is_auditor">
+    <span>Auditor</span>
+  </div>
+  <div v-else-if="student.is_withdrawn">
+    Withdrawn<span v-if="student.withdrawn_week"> {{ student.withdrawn_week }}</span>
+  </div>
+  <div v-else>
+    <span v-if="student.has_writing_credit"><abbr title="Writing credit">W</abbr></span>
+    <div v-if="student.has_incomplete">
+      <span>Submitted grade:</span>
+      <strong><abbr title="Incomplete">I</abbr></strong>
+      <div>Default: {{ student.grade }}"</div>
+    </div>
+    <div v-else>
+      <div v-if="student.no_grade_now">
+        <span>Submitted grade:</span><strong>X</strong>
+        <div>(No grade now)</div>
+      </div>
+      <div v-else>
+        <span>Submitted grade:</span>
+        <strong>{{ student.grade }}</strong>
+      </div>
+    </div>
+    <div v-if="student.date_graded">
+      Submitted {{ student.date_graded }}
+    </div>
+    <div v-if="student.grade_status">
+      Submitted with error: {{ student.grade_status }}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    student: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>

course_grader_vue/components/graderoster/student.vue

@@ -16,17 +16,24 @@
         </span>
       </div>
     </div>
-    <div>
-      <template v-if="student.grade">{{ student.grade }}</template>
-      <template v-if="student.is_writing_section"><abbr title="Writing Credit">W</abbr></template>
-      <template v-if="student.is_auditor">AUDITOR</template>
-      <template v-if="student.is_withdrawn">WITHDRAWN</template>
+    <div v-if="student.grade_url">
+      <GradeInput :student="student"></GradeInput>
+    </div>
+    <div v-else>
+      <GradeStatic :student="student"></GradeStatic>
     </div>
   </div>
 </template>
 
 <script>
+import GradeStatic from "@/components/graderoster/grade/static.vue";
+import GradeInput from "@/components/graderoster/grade/input.vue";
+
 export default {
+  components: {
+    GradeStatic,
+    GradeInput,
+  },
   props: {
     student: {
       type: Object,

course_grader_vue/layouts/default.vue

@@ -28,7 +28,7 @@
           value="Clear override"
           @click="clearUserOverride()"
         >
-          Clear
+          Clear override
         </button>
       </axdd-profile>
       <axdd-profile v-else :user-netid="userName">