Skip to content

Commit

Permalink
Merge pull request #229 from SayedZeeshanHyder/main
Browse files Browse the repository at this point in the history
Fixed the Necessary Bugs
  • Loading branch information
SayedZeeshanHyder authored Jul 26, 2024
2 parents 8dc43de + d723e98 commit 8ccd3c9
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 15 deletions.
6 changes: 2 additions & 4 deletions lib/new_ui/screens/attendance_screen/attendance_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
style: TextStyle(color: Colors.white, fontSize: 25),
),
Text(
'${(circularMap["attendedLectures"]/circularMap["totalLectures"]).toStringAsFixed(2)}',
'${circularMap["attendedLectures"]}/${circularMap["totalLectures"]}',
style: TextStyle(color: Colors.white, fontSize: 15),
),
],
Expand Down Expand Up @@ -599,7 +599,6 @@ String getTextForCard(int at,int tt){
while(1==1) {
double t=(attended)/(total+1);
if(t>=0.75){
print("yes of 1");
total++;
toAttend--;
} else {
Expand All @@ -610,7 +609,6 @@ String getTextForCard(int at,int tt){
while(1==1) {
double t=(attended+1)/(total+1);
if(t<=0.75){
print("yes of 2");
total++;
attended++;
toAttend++;
Expand All @@ -620,7 +618,7 @@ String getTextForCard(int at,int tt){
}
}

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

Expand Down
7 changes: 4 additions & 3 deletions lib/new_ui/screens/notes_screen/widgets/download_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ class _DownloadButtonState extends ConsumerState<DownloadButton> {
_onButtonClick(widget.url);
},
child: _storageResult == null || _storageResult!.isDownloadInProgress
? SizedBox(
height: 24,
width: 24,
? Container(
padding: EdgeInsets.symmetric(vertical: 5),
alignment: Alignment.center,

child: CircularProgressIndicator(
value: _downloadPrecent <= 0 ? null : _downloadPrecent,
),
Expand Down
1 change: 1 addition & 0 deletions lib/new_ui/screens/notes_screen/widgets/notes_modal.dart
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ class _NotesModalState extends ConsumerState<NotesModal> {

@override
Widget build(BuildContext context) {
print("Inside NotesModal");
UserModel user = ref.watch(userModelProvider)!;

SubjectModel subjects = ref.read(subjectsProvider);
Expand Down
48 changes: 40 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.8.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
linkify:
dependency: transitive
description:
Expand Down Expand Up @@ -828,26 +852,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -884,10 +908,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1357,6 +1381,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
watcher:
dependency: transitive
description:
Expand Down

0 comments on commit 8ccd3c9

Please sign in to comment.