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

Added Day shift selector entry, temporary diversion from task database csv style

Browse Source
This commit is contained in:
neviyn 2018-11-16 14:47:12 +00:00
parent f2d4a76e74
commit 8016c4163e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Entity.kt
View File

@ -99,7 +99,7 @@ data class Observation(
val persons: Set<Person> val persons: Set<Person>
) { ) {
fun toCsvFormat(): String { fun toCsvFormat(): String {
return ",,\"${tutors.elementAt(0).name}\",$date,\"$observed\",\"Training\",\"Performance Improvement - Training\",\"${site.name}\",\"N/A\"," + return ",,\"${tutors.joinToString { it.name }}\",$date,\"$observed\",\"Training\",\"Performance Improvement - Training\",\"${site.name}\",\"N/A\"," +
"${roundScore(monitoring)},${roundScore(controlProcedural)},${roundScore(control)}," + "${roundScore(monitoring)},${roundScore(controlProcedural)},${roundScore(control)}," +
"${roundScore(conservatism)},${roundScore(teamworkCommunications)},${roundScore(teamworkLeadership)}," + "${roundScore(conservatism)},${roundScore(teamworkCommunications)},${roundScore(teamworkLeadership)}," +
"${roundScore(teamworkWorkload)},${roundScore(knowledge)},\"${getStrengths(RatingCategory.MONITORING)}\"," + "${roundScore(teamworkWorkload)},${roundScore(knowledge)},\"${getStrengths(RatingCategory.MONITORING)}\"," +
@ -113,11 +113,11 @@ data class Observation(
} }
private fun getStrengths(category: RatingCategory): String { private fun getStrengths(category: RatingCategory): String {
return entries.asSequence().filter { it.type == category }.map { it.strengths }.joinToString() return entries.asSequence().filter { it.type == category && it.strengths.isNotBlank() }.map { it.strengths }.joinToString()
} }
private fun getImprovements(category: RatingCategory): String { private fun getImprovements(category: RatingCategory): String {
return entries.asSequence().filter { it.type == category }.map { it.improvements }.joinToString() return entries.asSequence().filter { it.type == category && it.improvements.isNotBlank() }.map { it.improvements }.joinToString()
} }
private fun roundScore(input: Double?): String { private fun roundScore(input: Double?): String {

1
frontend/src/views/StartNew.vue
View File

@ -41,6 +41,7 @@
<option value="C">C</option> <option value="C">C</option>
<option value="D">D</option> <option value="D">D</option>
<option value="E">E</option> <option value="E">E</option>
<option value="DAY">Day</option>
</b-form-select> </b-form-select>
</b-form-group> </b-form-group>
</b-col> </b-col>