search

amalieeh / assessment-support

TDT4501 Computer Science, Specialization Project (2021 FALL) with Sylvi Phuong Huynh @sylvihuynh. About Learning technology.
0 stars 0 forks source link

buttons approval page #118

Closed sylvihuynh closed 2 years ago

sylvihuynh commented 2 years ago

fix #103 fix #58

Removed the Tilbake button on the page and added a back arrow to the assessment page instead. Added tooltip and check for approval so one cannot approve unless all conflicts are solved.

One thing is that this looks kind of similar to the assessment page now as the header is the same. Maybe we need to do some adjustments here. I added a suggestion on this PR #119

This PR has a lot of commits because and is confusing because I struggled with some merging with another branch related to #117

image
amalieeh commented 2 years ago

There is so much conflicts that I will pull in and merge from main, rather than rebase, so that it is easier to revert if I make a mistake :)

sylvihuynh commented 2 years ago

We had a short discussion on that it may not be necessary to have the arrow which routes back to the assessment page as this is an unlikely case. We could for instance replace it with a home button that routes to the task page. Not sure if it is obvious that home is task page though

sylvihuynh commented 2 years ago

There is so much conflicts that I will pull in and merge from main, rather than rebase, so that it is easier to revert if I make a mistake :)

Oki, but if it is confusing I can try to fix it as I worked with most of the code, so maybe (hopefully) I will get it quick.

amalieeh commented 2 years ago

Oki, but if it is confusing I can try to fix it as I worked with most of the code, so maybe (hopefully) I will get it quick.

Oh yeah sure! I was just uncertain how available you are so I started rebasing stuff :) It is lovely if you do it!

sylvihuynh commented 2 years ago

Oki, but if it is confusing I can try to fix it as I worked with most of the code, so maybe (hopefully) I will get it quick.

Oh yeah sure! I was just uncertain how available you are so I started rebasing stuff :) It is lovely if you do it! I'll do it tomorrow

sylvihuynh commented 2 years ago

I rebased but something happened with the saving in the approval page, so the state of the assessment with the inconsistent score is not saved. The score is still "".

Edit: fixed