Skip to content

Commit

Permalink
Merge pull request #216 from 12fahed/main
Browse files Browse the repository at this point in the history 
ui update in attendance
  • Loading branch information
@12fahed
12fahed authored Jul 20, 2024
2 parents 9aed02a + eb988f6 commit cf8f1df
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 36 deletions.
Binary file added assets/images/attendance.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 40 additions & 22 deletions lib/new_ui/screens/attendance_screen/attendance_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,27 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
),
Text(
'${((attendedLectures/totalLectures) * 100).toStringAsFixed(2)}%',
style: TextStyle(color: Colors.white, fontSize: 17),
style: TextStyle(color: Colors.white, fontSize: 25),
),
Text(
'${attendedLectures}/${totalLectures}',
style: TextStyle(color: Colors.white, fontSize: 13),
style: TextStyle(color: Colors.white, fontSize: 15),
),
],
),
),
),
SizedBox(
width: 100,
height: 100,
width: 150,
height: 150,
child: CircularProgressIndicator(
value: totalLectures==0?0:(attendedLectures/totalLectures),
backgroundColor: Colors.white,
valueColor:
AlwaysStoppedAnimation<Color>(oldDateSelectBlue),
strokeWidth: 3,
strokeWidth: 5,
strokeAlign: BorderSide.strokeAlignInside,
strokeCap: StrokeCap.butt,
strokeCap: StrokeCap.round,
),
),
],
Expand All @@ -107,9 +107,24 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
return Center(child: CircularProgressIndicator());
}
var documentSnapshot = snapshot.data as DocumentSnapshot;
if(documentSnapshot.data()==null ){
return Center(child: Text("Please add Subject",style: TextStyle(color: Colors.white),));
if (documentSnapshot.data() == null) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Image.asset('assets/images/attendance.png',
width: 250,
),
SizedBox(height: 20),
Text(
"Please add Subject",
style: TextStyle(color: Colors.white, fontSize: 18),
),
],
),
);
}

var data = documentSnapshot.data() as Map<String, dynamic>;
List attendanceList = data['attendance'];
List<Map<String, dynamic>> attendanceList2 = attendanceList.cast<Map<String, dynamic>>();
Expand Down Expand Up @@ -287,7 +302,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
children: [
Text(
attendanceInfo["subject_name"],
style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold),
style: TextStyle(color: Colors.white, fontSize: 25, fontWeight: FontWeight.bold),
),
SizedBox(width: 5,),
],
Expand All @@ -302,7 +317,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
),
Text(
'${(attendanceInfo['present']/attendanceInfo['total'] *100).toInt()}%',
style: TextStyle(color: Colors.white, fontSize: 14),
style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold),
),
],
),
Expand All @@ -321,7 +336,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
AttendanceService.markPresent(attendanceList, index);
_fetchAndSetAttendance();
},
child: const Text('Present', style: TextStyle(color: Colors.white),),
child: const Text('Present', style: TextStyle(color: Colors.white, fontSize: 12),),
style: ElevatedButton.styleFrom(
backgroundColor: commonbgL3ightblack,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
Expand All @@ -333,7 +348,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
AttendanceService.markAbsent(attendanceList, index);
_fetchAndSetAttendance();
},
child: const Text('Absent', style: TextStyle(color: Colors.white),),
child: const Text('Absent', style: TextStyle(color: Colors.white, fontSize: 12),),
style: ElevatedButton.styleFrom(
backgroundColor: commonbgL3ightblack,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
Expand All @@ -345,14 +360,15 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
Center(
child: Container(
width: size.width * 0.88,
decoration: BoxDecoration(
border: Border.all(color: timePickerBorder, width: 1.0),
borderRadius: BorderRadius.circular(10.0),
color: timePickerBg,
),
alignment: Alignment.center,
// decoration: BoxDecoration(
// border: Border.all(color: timePickerBorder, width: 1.0),
// borderRadius: BorderRadius.circular(10.0),
// color: timePickerBg,
// ),
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(getTextForCard(attendanceInfo['present'], attendanceInfo['total']),style: TextStyle(color: Colors.grey),),
padding: const EdgeInsets.all(2.0),
child: Text(getTextForCard(attendanceInfo['present'], attendanceInfo['total']),style: TextStyle(color: Colors.grey, fontSize: 10),),
),
),
),
Expand Down Expand Up @@ -527,7 +543,7 @@ String getTextForCard(int at,int tt){


if (attended/total==0.75){
return "You are Just on track, well done Champ";
return "You are Just on track, keep it up !";
} else if(attended/total>0.75) {
while(1==1) {
double t=(attended)/(total+1);
Expand All @@ -553,7 +569,9 @@ String getTextForCard(int at,int tt){
}
}

if (toAttend==0) {
return "You are on track, keep it up !";
}


return "By attending next ${toAttend} lectures, you will be above 75%";
return "Your presence in next ${toAttend} classes is crucial";
}
4 changes: 2 additions & 2 deletions lib/new_ui/screens/main_screen/widgets/main_bottom_nav_bar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ class _HomeScreenState extends ConsumerState<MainBottomNavBar> {
),
BottomNavigationBarItem(
backgroundColor: Colors.transparent,
activeIcon: Icon(Icons.pentagon),
icon: Icon(Icons.pentagon_outlined),
activeIcon: Icon(Icons.calendar_month),
icon: Icon(Icons.calendar_month_outlined),
label: "Attendance",
),
BottomNavigationBarItem(
Expand Down
24 changes: 12 additions & 12 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,26 +788,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.1"
linkify:
dependency: transitive
description:
Expand Down Expand Up @@ -860,10 +860,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.12.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -1249,10 +1249,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.7.0"
textfield_search:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1377,10 +1377,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "13.0.0"
version: "14.2.1"
watcher:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ flutter:
- assets/images/devs.png
- assets/images/tick2.png
- assets/images/railway.png
- assets/images/attendance.png
- assets/icons/
- assets/animation/
# An image asset can refer to one or more resolution-specific "variants", see
Expand Down

0 comments on commit cf8f1df

Please sign in to comment.