Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed silentLogin cardOrder bug #2034

Open
wants to merge 12 commits into
base: experimental
Choose a base branch
from
Open

Fixed silentLogin cardOrder bug #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cde3294
Fixed silent login
MaximPodgore Apr 8, 2024
3d91005
Trying to make Manual recognize non-default orders
MaximPodgore Apr 9, 2024
f54d471
Cleaning up
MaximPodgore Apr 20, 2024
1ef8e09
Cleaned up the changes
MaximPodgore Apr 22, 2024
494cfc3
last change
MaximPodgore Apr 22, 2024
9df58bc
Removed automatic .project changes
MaximPodgore Apr 22, 2024
eb346ce
Update user.dart
MaximPodgore Apr 22, 2024
20829ef
Update cards.dart
MaximPodgore Apr 22, 2024
00f5557
Undoing the android/.settings changes
MaximPodgore Apr 22, 2024
46a2e4a
Typo fix of comment
MaximPodgore Oct 1, 2024
59148e4
Trying to revert all changes. It seems to still whitescreen when no f…
MaximPodgore Oct 3, 2024
df67e02
Removing spaces
MaximPodgore Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/core/providers/cards.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class CardsDataProvider extends ChangeNotifier {
'employee_id',
];

// Default card states
for (String card in CardTitleConstants.titleMap.keys.toList()) {
_cardStates![card] = true;
}
Expand Down Expand Up @@ -255,11 +256,12 @@ class CardsDataProvider extends ChangeNotifier {
}
}


activateStudentCards() {
int index = _cardOrder!.indexOf('MyStudentChart') + 1;
_cardOrder!.insertAll(index, _studentCards.toList());

// TODO: test w/o this
// TODO: test w/o this (duplicated the cards)
_cardOrder = List.from(_cardOrder!.toSet().toList());

updateCardOrder(_cardOrder);
Expand All @@ -271,7 +273,7 @@ class CardsDataProvider extends ChangeNotifier {
int index = _cardOrder!.indexOf('MyStudentChart') + 1;
_cardOrder!.insertAll(index, _studentCards.toList());

// TODO: test w/o this
// TODO: test w/o this (duplicated the cards)
_cardOrder = List.from(_cardOrder!.toSet().toList());

for (String card in _studentCards) {
Expand Down
3 changes: 1 addition & 2 deletions lib/core/providers/user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ class UserDataProvider extends ChangeNotifier {

if (username.isNotEmpty && password.isNotEmpty) {
_encryptAndSaveCredentials(username, password);

if (await silentLogin()) {
if (_userProfileModel!.classifications!.student!) {
_cardsDataProvider!.showAllStudentCards();
Expand Down Expand Up @@ -219,8 +218,8 @@ class UserDataProvider extends ChangeNotifier {
await updateAuthenticationModel(_authenticationService.data);

await fetchUserProfile();

CardsDataProvider _cardsDataProvider = CardsDataProvider();
//_cardsDataProvider.loadSavedData();
_cardsDataProvider
.updateAvailableCards(_userProfileModel!.ucsdaffiliation);

Expand Down