+
-
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+
+ -
+
+
+
Chapter : Topic
+
+
+
+
+
+
diff --git a/src/app/tabs/more/attendance/attendance.component.scss b/src/app/tabs/more/attendance/attendance.component.scss
index 02d0881..1a46695 100644
--- a/src/app/tabs/more/attendance/attendance.component.scss
+++ b/src/app/tabs/more/attendance/attendance.component.scss
@@ -49,7 +49,7 @@
display: flex;
align-items: center;
position: relative;
- overflow: visible;
+ overflow: hidden;
padding: 20px 10%;
background-color: var(--ash-black);
@@ -62,7 +62,7 @@
height: 100%;
width: 100vw;
border-radius: 50%;
- transform: scale(1.5)translateY(-5vw);
+ transform: scale(1.2)translateY(-5vw);
}
.stat {
@@ -72,6 +72,18 @@
padding: 15px 0;
border-right: 1px solid var(--light-grey);
+ &.safe {
+ h4 {
+ color: var(--green);
+ }
+ }
+
+ &.danger {
+ h4 {
+ color: var(--danger);
+ }
+ }
+
&:last-child {
border-right: 0;
}
@@ -134,3 +146,142 @@
color: white;
}
}
+
+.month-list {
+ list-style: none;
+ margin-top: 5px;
+
+ .month {
+ &.active {
+ .list-header .icon {
+ transform: rotate(90deg);
+ }
+
+ .list-header {
+ border-color: var(--dark-grey);
+ position: sticky;
+ position: -webkit-sticky;
+ top: 60px;
+ z-index: 1;
+ }
+
+ .subject-list {
+ display: block;
+ }
+ }
+ }
+
+ .list-header {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ padding: 15px 5%;
+ background-color: var(--ash-black);
+ border-bottom: 1px solid var(--black);
+
+ .content {
+ flex-grow: 1;
+ }
+
+ label {
+ font-size: 15px;
+ color: white;
+ }
+
+ p {
+ font-size: 14px;
+ color: var(--light-grey);
+ margin-top: 5px;
+ }
+
+ .progress {
+ width: 100px;
+ text-align: right;
+ margin-right: 15px;
+ color: white;
+ font-size: 16px;
+ }
+
+ .icon {
+ fill: var(--light-grey);
+ width: 15px;
+ height: 15px;
+
+ &.arrow {
+ width: 20px;
+ height: 20px;
+ }
+ }
+ }
+
+ .subject-list {
+ list-style: none;
+ padding: 0 5% 15px;
+ display: none;
+
+ header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 15px 0;
+
+ p {
+ color: var(--light-grey);
+ font-size: 14px;
+ }
+
+ .progress {
+ font-size: 16px;
+ color: white;
+ }
+ }
+ }
+
+ .subject {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 15px 5%;
+ background-color: var(--ash-black);
+ border-radius: 15px;
+ margin-bottom: 15px;
+
+ &.completed {
+ .icon {
+ fill: var(--green);
+ }
+ }
+
+ &.failed {
+ .icon {
+ fill: var(--danger);
+ }
+ }
+
+ &.warning {
+ .icon {
+ fill: rgba(orange, 0.5);
+ }
+ }
+
+ label {
+ font-size: 15px;
+ color: white;
+ }
+
+ p {
+ font-size: 14px;
+ color: var(--light-grey);
+ margin-top: 5px;
+ }
+
+ .icon {
+ width: 20px;
+ height: 20px;
+ fill: var(--light-grey);
+ background-color: white;
+ border-radius: 50%;
+ }
+ }
+
+}
diff --git a/src/app/tabs/more/attendance/attendance.component.ts b/src/app/tabs/more/attendance/attendance.component.ts
index 638ebf6..5438ade 100644
--- a/src/app/tabs/more/attendance/attendance.component.ts
+++ b/src/app/tabs/more/attendance/attendance.component.ts
@@ -7,6 +7,8 @@ import { Location } from '@angular/common';
styleUrls: ['./attendance.component.scss']
})
export class AttendanceComponent implements OnInit {
+ selectedList: number = 1;
+ selectedSegment: string = 'ALL';
constructor(
private location: Location
@@ -16,7 +18,7 @@ export class AttendanceComponent implements OnInit {
}
back() {
- this.location.back();
+ this.location.back();
}
}
diff --git a/src/styles.scss b/src/styles.scss
index 9f94107..848bc73 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -18,4 +18,5 @@
--teal: #06c4a8;
--green: #8cc63f;
--teal-green: #08c17e;
+ --danger: #ea8b8b;
}