diff --git a/src/app/edit-absences/components/edit-absences-header/edit-absences-header.component.scss b/src/app/edit-absences/components/edit-absences-header/edit-absences-header.component.scss index 1070d4ef6..63b863c96 100644 --- a/src/app/edit-absences/components/edit-absences-header/edit-absences-header.component.scss +++ b/src/app/edit-absences/components/edit-absences-header/edit-absences-header.component.scss @@ -7,21 +7,24 @@ border-bottom: 1px solid $border-color; } +.filters { + display: block; + flex-direction: row; + align-items: flex-end; +} + .form-group { flex: 1; margin-right: $spacer; - margin-bottom: 0; + margin-bottom: 0.5rem; + float: left; } - .buttons { flex: none; margin-right: 0; -} - -.filters { - display: flex; - flex-direction: row; - align-items: flex-end; + padding-top: 31px; + float: left; + margin-bottom: 1rem; } .extended-filters-header { diff --git a/src/app/edit-absences/components/edit-absences-list/edit-absences-list.component.html b/src/app/edit-absences/components/edit-absences-list/edit-absences-list.component.html index 1ed7f5da8..ece43f638 100644 --- a/src/app/edit-absences/components/edit-absences-list/edit-absences-list.component.html +++ b/src/app/edit-absences/components/edit-absences-list/edit-absences-list.component.html @@ -38,7 +38,7 @@ edit - +
- - - - - - + - - +
@@ -74,7 +74,10 @@
+ + {{ entry.presenceCategoryIcon }} + {{ entry.lessonPresence.StudentFullName }}
{{ entry.lessonPresence.EventDesignation }}, {{ entry.lessonPresence.StudyClassNumber }} 		+ {{ entry.lessonPresence.LessonDateTimeFrom | date: 'shortTime' }}–{{ entry.lessonPresence.LessonDateTimeTo | date: 'shortTime' }} {{ entry.confirmationState?.Value }} + + {{ entry.confirmationState?.Value }} + {{ entry.presenceType?.Designation }}
{{ entry.lessonPresence.Comment }} 		+ {{ entry.lessonPresence.LessonDateTimeFrom | date: 'mediumDate' }} {{ entry.lessonPresence.TeacherInformation }} + {{ entry.lessonPresence.TeacherInformation }} +
diff --git a/src/app/edit-absences/components/edit-absences/edit-absences.component.scss b/src/app/edit-absences/components/edit-absences/edit-absences.component.scss index 07eed8078..287faf5e5 100644 --- a/src/app/edit-absences/components/edit-absences/edit-absences.component.scss +++ b/src/app/edit-absences/components/edit-absences/edit-absences.component.scss @@ -2,5 +2,4 @@ :host { display: block; - min-width: $erz-edit-absences-min-width; } diff --git a/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.html b/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.html index 112ba50f2..261d93128 100644 --- a/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.html +++ b/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.html @@ -1,29 +1,31 @@ -
- - -
+
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- +
+ +
diff --git a/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.scss b/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.scss index c805509de..07307a979 100644 --- a/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.scss +++ b/src/app/evaluate-absences/components/evaluate-absences-header/evaluate-absences-header.component.scss @@ -8,13 +8,22 @@ border-bottom: 1px solid $border-color; } +.filters { + display: block; + flex-direction: row; + align-items: flex-end; +} + .form-group { flex: 1; margin-right: $spacer; - margin-bottom: 0; + margin-bottom: 0.5rem; + float: left; } - .buttons { flex: none; margin-right: 0; + padding-top: 31px; + float: left; + margin-bottom: 1rem; } diff --git a/src/app/evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html b/src/app/evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html index b3823230f..05b1b132e 100644 --- a/src/app/evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html +++ b/src/app/evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html @@ -1,7 +1,11 @@
- +
- - - + + - - - - + + + +
@@ -23,15 +27,55 @@
{{ entry.StudentFullName }}{{ entry.TotalAbsences }} + + {{ entry.StudentFullName }} + + {{ entry.TotalAbsences }} + {{ entry.TotalAbsencesValidExcuse }} {{ entry.TotalAbsencesWithoutExcuse }}{{ entry.TotalAbsencesUnconfirmed }}{{ entry.TotalIncidents }}{{ entry.TotalHalfDays }} + {{ entry.TotalAbsencesWithoutExcuse }} + + {{ entry.TotalAbsencesUnconfirmed }} + + {{ entry.TotalIncidents }} + + {{ entry.TotalHalfDays }} +
diff --git a/src/app/evaluate-absences/components/evaluate-absences/evaluate-absences.component.scss b/src/app/evaluate-absences/components/evaluate-absences/evaluate-absences.component.scss index b5eac1eae..287faf5e5 100644 --- a/src/app/evaluate-absences/components/evaluate-absences/evaluate-absences.component.scss +++ b/src/app/evaluate-absences/components/evaluate-absences/evaluate-absences.component.scss @@ -2,5 +2,4 @@ :host { display: block; - min-width: $erz-evaluate-absences-min-width; } diff --git a/src/app/open-absences/components/open-absences-edit/open-absences-edit.component.scss b/src/app/open-absences/components/open-absences-edit/open-absences-edit.component.scss index e69de29bb..ab51f5bae 100644 --- a/src/app/open-absences/components/open-absences-edit/open-absences-edit.component.scss +++ b/src/app/open-absences/components/open-absences-edit/open-absences-edit.component.scss @@ -0,0 +1,3 @@ +.erz-container > form > div > button .spinner-border { + margin-top: 0 !important; +} diff --git a/src/app/presence-control/components/presence-control-header/presence-control-header.component.scss b/src/app/presence-control/components/presence-control-header/presence-control-header.component.scss index 9bc78f64d..747696d22 100644 --- a/src/app/presence-control/components/presence-control-header/presence-control-header.component.scss +++ b/src/app/presence-control/components/presence-control-header/presence-control-header.component.scss @@ -6,7 +6,6 @@ display: flex; flex-direction: column; padding: 0.75 * $spacer $spacer; - background-color: $gray-100; } /** diff --git a/src/app/shared/components/spinner/spinner.component.scss b/src/app/shared/components/spinner/spinner.component.scss index 55a105251..b0bafd7cd 100644 --- a/src/app/shared/components/spinner/spinner.component.scss +++ b/src/app/shared/components/spinner/spinner.component.scss @@ -1,9 +1,11 @@ .spinner-container { - margin-top: 20vh; text-align: center; + top: -131px; + min-height: 200px; } .spinner-border { width: 3rem; height: 3rem; + margin-top: 100px; } diff --git a/src/app/shared/styles/container.scss b/src/app/shared/styles/container.scss index 1dadc8ff9..f8a73f36c 100644 --- a/src/app/shared/styles/container.scss +++ b/src/app/shared/styles/container.scss @@ -1,5 +1,4 @@ .erz-container { - max-width: $erz-container-max-width; margin: 0 auto; padding: 0 $erz-container-padding-x; } @@ -8,3 +7,12 @@ padding-top: $erz-container-padding-y; padding-bottom: $erz-container-padding-y; } + +.form-check-label { + margin-left: 0.5rem; +} + +.ngb-dp-months { + padding: 5px 30px 5px 29px; + background: #f8f9fa; +} diff --git a/src/app/shared/styles/table.scss b/src/app/shared/styles/table.scss index 9e572eba0..31a389b48 100644 --- a/src/app/shared/styles/table.scss +++ b/src/app/shared/styles/table.scss @@ -1,12 +1,7 @@ -.table thead { - background-color: $table-head-bg; -} - .table th { padding-top: $spacer / 4; padding-bottom: $spacer / 4; color: $table-head-color; - font-size: $font-size-sm; font-weight: 300; text-transform: uppercase; } @@ -14,3 +9,44 @@ .table-fixed { table-layout: fixed; } + +@media screen and (max-width: 820px) { + table thead { + border: none; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; + } + .presence-category { + text-align: right !important; + } + + .designation-comment { + max-width: initial !important; + } + + .edit-absences-checkbox { + text-align: left; + } + + table tr { + border-bottom: 2px solid #ddd; + display: block; + } + + table td { + border-bottom: 1px solid #ddd; + display: block; + text-align: right; + min-height: 50px; + } + + table td::before { + content: attr(data-label); + float: left; + } +} diff --git a/src/assets/locales/de-CH.json b/src/assets/locales/de-CH.json index 75025bc17..b07225aa6 100644 --- a/src/assets/locales/de-CH.json +++ b/src/assets/locales/de-CH.json @@ -125,7 +125,9 @@ "presence-type": "Grund", "comment": "Kommentar", "date": "Datum", - "teacher": "Lehrkraft" + "teacher": "Lehrkraft", + "mobil-student-module-instance-study-class": "Name, Fach, Klasse", + "mobil-presence-type-comment": "Kommentar, Grund" } }, "edit": { diff --git a/src/bootstrap-variables.scss b/src/bootstrap-variables.scss index 45aa9dca8..a201ece47 100644 --- a/src/bootstrap-variables.scss +++ b/src/bootstrap-variables.scss @@ -8,8 +8,9 @@ $blue: rgb(65, 118, 145); $teal: rgb(19, 69, 97); $gray: rgb(138, 138, 138); $gray-dark: rgb(51, 51, 51); +$blue: #005189; -$primary: $yellow; +$primary: $blue; $secondary: $gray; // font @@ -31,7 +32,3 @@ $erz-container-padding-x: $spacer; $erz-container-padding-y: $spacer; $erz-presence-control-entry-min-width: 400px; - -$erz-edit-absences-min-width: 900px; - -$erz-evaluate-absences-min-width: 800px; diff --git a/src/index.html b/src/index.html index 6c850d3ae..f953062cc 100644 --- a/src/index.html +++ b/src/index.html @@ -10,11 +10,10 @@ - - - - - - + + + + +