neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

newUI #1

Merged
neviyn merged 7 commits from newUI into master 2020-09-18 09:49:05 +01:00
Conversation 0 Commits 7 Files Changed 13 +23 -26
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3305d8f53 - Show all commits

2
frontend/src/components/ObservationEntry.vue
View File

@ -3,7 +3,7 @@
<b-row> <b-row>
<b-col cols="3"> <b-col cols="3">
<p>{{ description }}</p> <p>{{ description }}</p>
<h4 v-bind:class="{ scorewarn: rating < 3 }"> <h4 v-bind:class="{ scorewarn: rating < 3}" v-if="rating > 0">
{{ rating }} {{ rating }}
</h4> </h4>
</b-col> </b-col>

2
frontend/src/components/ScoreSelector.vue
View File

@ -8,7 +8,7 @@
invalid-feedback="Please select a score." invalid-feedback="Please select a score."
required required
> >
<b-form-radio button-variant="0" value=null>&nbsp;</b-form-radio> <b-form-radio button-variant="0" value="0">&nbsp;</b-form-radio>
<b-form-radio button-variant="1" value="1">1</b-form-radio> <b-form-radio button-variant="1" value="1">1</b-form-radio>
<b-form-radio button-variant="2" value="2">2</b-form-radio> <b-form-radio button-variant="2" value="2">2</b-form-radio>
<b-form-radio button-variant="3" value="3">3</b-form-radio> <b-form-radio button-variant="3" value="3">3</b-form-radio>

45
frontend/src/views/ViewObservations.vue
View File

@ -148,102 +148,99 @@
</b-row> </b-row>
<br /> <br />
<b-row class="mb-2"> <b-row class="mb-2">
<b-col class="centered-image" v-if="observation.monitoring"> <b-col class="centered-image">
<img <img
src="../assets/Monitoring.svg" src="../assets/Monitoring.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ scorewarning: observation.monitoring < 2.5 }" v-bind:class="{ scorewarning: observation.monitoring < 2.5 && observation.monitoring > 0}"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.monitoring > 0">
{{ observation.monitoring.toFixed(1) }} {{ observation.monitoring.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col <b-col
class="centered-image" class="centered-image"
v-if="observation.controlProcedural"
> >
<img <img
src="../assets/Control.svg" src="../assets/Control.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ v-bind:class="{
scorewarning: observation.controlProcedural < 2.5 scorewarning: observation.controlProcedural < 2.5 && observation.controlProcedural > 0
}" }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.controlProcedural > 0">
{{ observation.controlProcedural.toFixed(1) }} {{ observation.controlProcedural.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col class="centered-image" v-if="observation.control"> <b-col class="centered-image">
<img <img
src="../assets/Control.svg" src="../assets/Control.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ scorewarning: observation.control < 2.5 }" v-bind:class="{ scorewarning: observation.control < 2.5 && observation.control > 0}"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.control > 0">
{{ observation.control.toFixed(1) }} {{ observation.control.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col class="centered-image" v-if="observation.conservatism"> <b-col class="centered-image">
<img <img
src="../assets/Conservatism.svg" src="../assets/Conservatism.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ v-bind:class="{
scorewarning: observation.conservatism < 2.5 scorewarning: observation.conservatism < 2.5 && observation.conservatism > 0
}" }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.conservatism > 0">
{{ observation.conservatism.toFixed(1) }} {{ observation.conservatism.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col <b-col
class="centered-image" class="centered-image"
v-if="observation.teamworkCommunications"
> >
<img <img
src="../assets/Teamwork.svg" src="../assets/Teamwork.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ v-bind:class="{
scorewarning: observation.teamworkCommunications < 2.5 scorewarning: observation.teamworkCommunications < 2.5 && observation.teamworkCommunications > 0
}" }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.teamworkCommunications > 0">
{{ observation.teamworkCommunications.toFixed(1) }} {{ observation.teamworkCommunications.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col <b-col
class="centered-image" class="centered-image"
v-if="observation.teamworkLeadership"
> >
<img <img
src="../assets/Teamwork.svg" src="../assets/Teamwork.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ v-bind:class="{
scorewarning: observation.teamworkLeadership < 2.5 scorewarning: observation.teamworkLeadership < 2.5 && observation.teamworkLeadership > 0
}" }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.teamworkLeadership > 0">
{{ observation.teamworkLeadership.toFixed(1) }} {{ observation.teamworkLeadership.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col class="centered-image" v-if="observation.teamworkWorkload"> <b-col class="centered-image">
<img <img
src="../assets/Teamwork.svg" src="../assets/Teamwork.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ v-bind:class="{
scorewarning: observation.teamworkWorkload < 2.5 scorewarning: observation.teamworkWorkload < 2.5 && observation.teamworkWorkload > 0
}" }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.teamworkWorkload > 0">
{{ observation.teamworkWorkload.toFixed(1) }} {{ observation.teamworkWorkload.toFixed(1) }}
</div> </div>
</b-col> </b-col>
<b-col class="centered-image" v-if="observation.knowledge"> <b-col class="centered-image">
<img <img
src="../assets/Knowledge.svg" src="../assets/Knowledge.svg"
class="image-opacity" class="image-opacity"
v-bind:class="{ scorewarning: observation.knowledge < 2.5 }" v-bind:class="{ scorewarning: observation.knowledge < 2.5 && observation.knowledge > 0 }"
/> />
<div class="image-centered-text"> <div class="image-centered-text" v-if="observation.knowledge > 0">
{{ observation.knowledge.toFixed(1) }} {{ observation.knowledge.toFixed(1) }}
</div> </div>
</b-col> </b-col>