-
+
+
{this.props.selectedInstance.name}
{createHeaders(this.props.courseData, this.props.studentInstance)}
diff --git a/labtool2.0/src/components/pages/CoursePage.js b/labtool2.0/src/components/pages/CoursePage.js
index 545930a40..1bd3f8275 100644
--- a/labtool2.0/src/components/pages/CoursePage.js
+++ b/labtool2.0/src/components/pages/CoursePage.js
@@ -21,6 +21,7 @@ import {
toggleCodeReview
} from '../../reducers/coursePageLogicReducer'
import { resetLoading } from '../../reducers/loadingReducer'
+import { trimDate } from '../../util/format'
export class CoursePage extends React.Component {
handleClick = (e, titleProps) => {
@@ -63,13 +64,6 @@ export class CoursePage extends React.Component {
})
}
- trimDate = date => {
- return new Date(date)
- .toLocaleString()
- .replace('/', '.')
- .replace('/', '.')
- }
-
changeHiddenAssistantDropdown = id => {
return () => {
this.props.showAssistantDropdown(this.props.coursePageLogic.showAssistantDropdown === id ? '' : id)
@@ -213,6 +207,10 @@ export class CoursePage extends React.Component {
const numberOfCodeReviews = Array.isArray(this.props.courseData.data) ? Math.max(...this.props.courseData.data.map(student => student.codeReviews.length)) : 0
const createIndents = (weeks, codeReviews, siId) => {
+ const cr = codeReviews &&
+ codeReviews.reduce((a, b) => {
+ return { ...a, [b.reviewNumber]: b.points }
+ }, {})
const indents = []
let i = 0
let finalPoints = undefined
@@ -236,19 +234,26 @@ export class CoursePage extends React.Component {
}
indents.push(pushattava)
}
+
let ii = 0
- codeReviews.forEach(cr => {
- indents.push(
{cr.points !== null ? {cr.points}
: -
} )
- ii++
- })
- while (ii < numberOfCodeReviews) {
- indents.push(
-
- -
-
- )
- ii++
+ const { amountOfCodeReviews } = this.props.selectedInstance
+ if (amountOfCodeReviews) {
+ for (let index = 1; index <= amountOfCodeReviews; index++) {
+ indents.push(
{cr[index] || cr[index] === 0 ? {cr[index]}
: -
} )
+ }
}
+ // codeReviews.forEach(cr => {
+ // indents.push(
{cr.points !== null ? {cr.points}
: -
} )
+ // ii++
+ // // })
+ // while (ii < numberOfCodeReviews) {
+ // indents.push(
+ //
+ // -
+ //
+ // )
+ // ii++
+ // }
if (this.props.selectedInstance.finalReview) {
let finalReviewPointsCell = (
@@ -271,7 +276,7 @@ export class CoursePage extends React.Component {
for (; i < this.props.selectedInstance.weekAmount; i++) {
headers.push(
Week {i + 1} )
}
- for (var ii = 1; ii <= numberOfCodeReviews; ii++) {
+ for (var ii = 1; ii <= this.props.selectedInstance.amountOfCodeReviews; ii++) {
headers.push(
Code Review {ii} )
}
if (this.props.selectedInstance.finalReview) {
@@ -344,7 +349,7 @@ export class CoursePage extends React.Component {
{comment.comment} {' '}
- {this.trimDate(comment.createdAt)}
+ {trimDate(comment.createdAt)}
@@ -357,7 +362,7 @@ export class CoursePage extends React.Component {
{comment.comment} {' '}
- {this.trimDate(comment.createdAt)}
+ {trimDate(comment.createdAt)}
{/* This hack compares user's name to comment.from and hides the email notification button when they don't match. */}
@@ -501,15 +506,15 @@ export class CoursePage extends React.Component {
let renderTeacherTopPart = () => {
return (
-
-
+
+
{this.props.selectedInstance.name}
{this.props.courseInstance && this.props.courseInstance.active === true ? (
this.props.courseData.data !== null ? (
) : (
-
+
You have not activated this course.
@@ -587,7 +592,7 @@ export class CoursePage extends React.Component {
)}
-
+
Student
@@ -749,7 +754,7 @@ export class CoursePage extends React.Component {
)
} else if (this.props.courseData.role === 'teacher') {
return (
-
+
{renderTeacherTopPart()}
{renderTeacherBottomPart()}
diff --git a/labtool2.0/src/components/pages/CreateChecklist.js b/labtool2.0/src/components/pages/CreateChecklist.js
index 08450c52e..caa077644 100644
--- a/labtool2.0/src/components/pages/CreateChecklist.js
+++ b/labtool2.0/src/components/pages/CreateChecklist.js
@@ -8,6 +8,8 @@ import { getOneCI, getAllCI } from '../../services/courseInstance'
import { resetChecklist, changeField, addTopic, addRow, removeTopic, removeRow, castPointsToNumber } from '../../reducers/checklistReducer'
import './CreateChecklist.css'
+import BackButton from '../BackButton'
+
export class CreateChecklist extends Component {
constructor(props) {
super(props)
@@ -328,6 +330,7 @@ export class CreateChecklist extends Component {
const { checklistJsx, maxPoints } = this.props.loading.loading ? { checklistJsx: null, maxPoints: null } : this.renderChecklist()
return (
+
{this.props.selectedInstance.name}
diff --git a/labtool2.0/src/components/pages/ModifyCourseInstanceCodeReviews.js b/labtool2.0/src/components/pages/ModifyCourseInstanceCodeReviews.js
index 9e15ddb89..4d52eec3f 100644
--- a/labtool2.0/src/components/pages/ModifyCourseInstanceCodeReviews.js
+++ b/labtool2.0/src/components/pages/ModifyCourseInstanceCodeReviews.js
@@ -1,5 +1,6 @@
import React from 'react'
import { connect } from 'react-redux'
+import { Link } from 'react-router-dom'
import { getOneCI } from '../../services/courseInstance'
import { coursePageInformation } from '../../services/courseInstance'
import { bulkinsertCodeReviews, removeOneCodeReview } from '../../services/codeReview'
@@ -22,6 +23,8 @@ import { Button, Table, Checkbox, Loader, Dropdown, Label, Popup, Modal, Icon }
import Notification from '../../components/pages/Notification'
import { resetLoading } from '../../reducers/loadingReducer'
+import BackButton from '../BackButton'
+
export class ModifyCourseInstanceReview extends React.Component {
state = {
open: {}
@@ -211,6 +214,23 @@ export class ModifyCourseInstanceReview extends React.Component {
!s[id] ? ((s[id] = true), this.setState({ open: s })) : ((s[id] = !s[id]), this.setState({ open: s }))
}
+ visibilityReminder = () =>
+ this.props.selectedInstance.currentCodeReview && this.props.codeReviewLogic.selectedDropdown ? (
+ this.props.selectedInstance.currentCodeReview.findIndex(cr => cr === this.props.codeReviewLogic.selectedDropdown) === -1 ? (
+
}
+ content={
+
+ This code review is currently not visible to students. You can make it visible on the
+ .
+
+ }
+ hoverable
+ />
+ ) : null
+ ) : null
+
render() {
if (this.props.loading.loading) {
return
@@ -218,6 +238,7 @@ export class ModifyCourseInstanceReview extends React.Component {
return (
+
{this.props.selectedInstance.name}
@@ -270,15 +291,17 @@ export class ModifyCourseInstanceReview extends React.Component {
Reviewer
Project Info
- {' '}
- 0 ? 'Select code review' : 'No code reviews'}
- fluid
- options={this.props.dropdownCodeReviews}
- />
+
+ 0 ? 'Select code review' : 'No code reviews'}
+ fluid
+ options={this.props.dropdownCodeReviews}
+ />
+
{this.props.codeReviewLogic.showCreate ? (
diff --git a/labtool2.0/src/components/pages/ModifyCourseInstancePage.js b/labtool2.0/src/components/pages/ModifyCourseInstancePage.js
index 0e589347a..6e327d0f9 100644
--- a/labtool2.0/src/components/pages/ModifyCourseInstancePage.js
+++ b/labtool2.0/src/components/pages/ModifyCourseInstancePage.js
@@ -9,6 +9,8 @@ import { clearNotifications } from '../../reducers/notificationReducer'
import { changeCourseField } from '../../reducers/selectedInstanceReducer'
import { resetLoading, addRedirectHook } from '../../reducers/loadingReducer'
+import BackButton from '../BackButton'
+
/**
* Page used to modify a courseinstances information. Can only be accessed by teachers.
*/
@@ -87,124 +89,127 @@ export class ModifyCourseInstancePage extends Component {
}
const selectedInstance = { ...this.props.selectedInstance }
return (
-
-
-
-
- Edit course: {selectedInstance.name}
-
-
-
-
-