Skip to content

Commit 6ce08d2

Browse files
jonathangomzjonathangomz
committed
Merge branch 'dev' into main
2 parents de2e0b7 + 061ffc9 commit 6ce08d2

File tree

19 files changed

+369
-120
lines changed

19 files changed

+369
-120
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
# CHANGELOG
22
All notable changes to this project will be documented in this file.
33

4+
## 2.2.3 - 2021-12-10 ✅
5+
### Added
6+
- (**Opt**) Student docs 🎉
7+
### Changed
8+
- Shimmer effect for ledger
9+
- Force only minor and major versions updates
10+
- OneSignal package version
11+
### Fixed
12+
- Invert order for movements in the same day for employees ledger at least
13+
- Not entering to the app if no internet connection
14+
415
## 2.2.2 - 2021-11-29
516
### Added
617
- Docs for services

‎ROADMAP.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ _**Changes & release dates in versions further from the next release are more li
1919
- Notifications are not marked as received on arrival
2020
- Because that code should be written in native code... F
2121

22-
## 2.2.3 - 2021-12-03 🚧
22+
## 2.2.3 - 2021-12-10 ✅
2323
### Adds
2424
- (**Opt**) Student docs 🎉
2525
### Change
26+
- Shimmer effect for ledger
2627
- Force only minor and major versions updates
27-
- Deprectad splash screen for new way
28+
- OneSignal package version
2829
### Fixes
2930
- Invert order for movements in the same day for employees ledger at least
31+
- Not entering to the app if no internet connection
3032

3133
## 2.2.2 - 2021-11-29 ✅
3234
### Adds

‎ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ end
3636

3737
target 'OneSignalNotificationServiceExtension' do
3838
use_frameworks!
39-
pod 'OneSignalXCFramework', '= 3.7.0'
39+
pod 'OneSignalXCFramework', '>= 3.4.3', '< 4.0'
4040
end
4141

4242
post_install do |installer|

‎ios/Podfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ PODS:
44
- Flutter
55
- flutter_custom_tabs (0.0.1):
66
- Flutter
7-
- onesignal_flutter (3.2.3):
7+
- onesignal_flutter (3.2.7):
88
- Flutter
9-
- OneSignalXCFramework (= 3.7.0)
10-
- OneSignalXCFramework (3.7.0)
9+
- OneSignalXCFramework (= 3.9.1)
10+
- OneSignalXCFramework (3.9.1)
1111
- package_info_plus (0.4.5):
1212
- Flutter
1313
- path_provider (0.0.1):
@@ -26,7 +26,7 @@ DEPENDENCIES:
2626
- flutter_config (from `.symlinks/plugins/flutter_config/ios`)
2727
- flutter_custom_tabs (from `.symlinks/plugins/flutter_custom_tabs/ios`)
2828
- onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
29-
- OneSignalXCFramework (= 3.7.0)
29+
- OneSignalXCFramework (< 4.0, >= 3.4.3)
3030
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
3131
- path_provider (from `.symlinks/plugins/path_provider/ios`)
3232
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
@@ -64,15 +64,15 @@ SPEC CHECKSUMS:
6464
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
6565
flutter_config: 2226c1df19c78fe34a05eb7f1363445f18e76fc1
6666
flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89
67-
onesignal_flutter: abfc75e8d08a0d9c977aacfab9454af58f4f4fcc
68-
OneSignalXCFramework: 974dc438d68910cf04f3c8ab034e0131d41438c1
67+
onesignal_flutter: be350169f5b07461e7b1e9c978d8a39908c5cf37
68+
OneSignalXCFramework: 27159b0a150cdfe528c85325215c9d78b2f973c7
6969
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
7070
path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
7171
shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273
7272
syncfusion_flutter_pdfviewer: bb9998884b864cfedf72628df3503bdf57e397c0
7373
url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
7474
video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb
7575

76-
PODFILE CHECKSUM: 99365d509a55af430558a41d568eef646ebb286c
76+
PODFILE CHECKSUM: 7ce4868f8f23a4006f1b03860bcb2dd1ba15b1a0
7777

7878
COCOAPODS: 1.11.2

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@
671671
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
672672
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
673673
CODE_SIGN_STYLE = Automatic;
674-
CURRENT_PROJECT_VERSION = 23;
674+
CURRENT_PROJECT_VERSION = 24;
675675
DEVELOPMENT_TEAM = CA5M4WA2HG;
676676
GCC_C_LANGUAGE_STANDARD = gnu11;
677677
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
@@ -681,7 +681,7 @@
681681
"@executable_path/Frameworks",
682682
"@executable_path/../../Frameworks",
683683
);
684-
MARKETING_VERSION = 2.2.2;
684+
MARKETING_VERSION = 2.2.3;
685685
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
686686
MTL_FAST_MATH = YES;
687687
PRODUCT_BUNDLE_IDENTIFIER = mx.edu.um.students.OneSignalNotificationServiceExtension;
@@ -706,7 +706,7 @@
706706
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
707707
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
708708
CODE_SIGN_STYLE = Automatic;
709-
CURRENT_PROJECT_VERSION = 23;
709+
CURRENT_PROJECT_VERSION = 24;
710710
DEVELOPMENT_TEAM = CA5M4WA2HG;
711711
GCC_C_LANGUAGE_STANDARD = gnu11;
712712
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
@@ -716,7 +716,7 @@
716716
"@executable_path/Frameworks",
717717
"@executable_path/../../Frameworks",
718718
);
719-
MARKETING_VERSION = 2.2.2;
719+
MARKETING_VERSION = 2.2.3;
720720
MTL_FAST_MATH = YES;
721721
PRODUCT_BUNDLE_IDENTIFIER = mx.edu.um.students.OneSignalNotificationServiceExtension;
722722
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -738,7 +738,7 @@
738738
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
739739
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
740740
CODE_SIGN_STYLE = Automatic;
741-
CURRENT_PROJECT_VERSION = 23;
741+
CURRENT_PROJECT_VERSION = 24;
742742
DEVELOPMENT_TEAM = CA5M4WA2HG;
743743
GCC_C_LANGUAGE_STANDARD = gnu11;
744744
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
@@ -748,7 +748,7 @@
748748
"@executable_path/Frameworks",
749749
"@executable_path/../../Frameworks",
750750
);
751-
MARKETING_VERSION = 2.2.2;
751+
MARKETING_VERSION = 2.2.3;
752752
MTL_FAST_MATH = YES;
753753
PRODUCT_BUNDLE_IDENTIFIER = mx.edu.um.students.OneSignalNotificationServiceExtension;
754754
PRODUCT_NAME = "$(TARGET_NAME)";

‎lib/modules/app_bar/modules/questionnaire/views/questionnaires_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:get/get.dart';
33
import 'package:ummobile/modules/app_bar/modules/questionnaire/bindings/health_questionnaire_bindings.dart';
44
import 'package:ummobile/modules/app_bar/views/appBar.dart';
5-
import 'package:ummobile/modules/tabs/modules/profile/models/user_credentials.dart';
65

76
import 'subpages/health_questionnaire/health_questionnaire.dart';
87

‎lib/modules/app_bar/modules/questionnaire/views/subpages/responses_list/user_responses_list.dart‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ import 'dart:convert';
22

33
import 'package:flutter/material.dart';
44
import 'package:get/get.dart';
5-
import 'package:ummobile/modules/app_bar/modules/questionnaire/bindings/health_questionnaire_bindings.dart';
6-
import 'package:ummobile/modules/app_bar/modules/questionnaire/views/subpages/health_questionnaire/subpages/answered_page.dart';
75
import 'package:ummobile/modules/app_bar/modules/questionnaire/views/subpages/responses_list/answered_page_scaffold.dart';
86
import 'package:ummobile/modules/app_bar/views/appBar.dart';
97
import 'package:ummobile/modules/login/controllers/login_controller.dart';
108
import 'package:ummobile/modules/login/controllers/questionnaire_response_controller.dart';
11-
import 'package:ummobile/modules/tabs/modules/profile/models/user_credentials.dart';
12-
13-
import '../health_questionnaire/health_questionnaire.dart';
149

1510
class HealthQuestionnaireResponses extends StatelessWidget {
1611
final LoginController _login = Get.find<LoginController>();

‎lib/modules/drawer/modules/portal/documents/bindings/document_images_binding.dart‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import 'package:get/get.dart';
2+
import 'package:ummobile/modules/drawer/modules/portal/documents/controllers/document_images_controller.dart';
3+
4+
class DocumentImagesBinding implements Bindings {
5+
final int documentId;
6+
7+
final int pagesCount;
8+
9+
DocumentImagesBinding(this.documentId, this.pagesCount);
10+
11+
@override
12+
void dependencies() {
13+
Get.lazyPut<DocumentImagesController>(
14+
() => DocumentImagesController(documentId, pagesCount));
15+
}
16+
}

‎lib/modules/drawer/modules/portal/documents/controllers/document_images_controller.dart‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import 'package:get/get.dart';
2+
import 'package:ummobile/modules/login/controllers/login_controller.dart';
3+
import 'package:ummobile/statics/templates/controller_template.dart';
4+
import 'package:ummobile_sdk/ummobile_sdk.dart';
5+
6+
class DocumentImagesController extends ControllerTemplate
7+
with StateMixin<List<DocumentPage>> {
8+
/// The document id
9+
final int documentId;
10+
11+
/// The amount of pages in the document
12+
final int pagesCount;
13+
14+
/// The document pages
15+
List<DocumentPage> pages = List<DocumentPage>.empty(growable: true);
16+
17+
DocumentImagesController(this.documentId, this.pagesCount);
18+
19+
Future<UMMobileAcademic> get academicApi async {
20+
String accessToken = await Get.find<LoginController>().token;
21+
return UMMobileAcademic(token: accessToken);
22+
}
23+
24+
@override
25+
void onInit() {
26+
fetchPages();
27+
super.onInit();
28+
}
29+
30+
@override
31+
void refreshContent() {
32+
change(null, status: RxStatus.loading());
33+
fetchPages();
34+
super.refreshContent();
35+
}
36+
37+
void fetchPages() async {
38+
for (int i = 0; i < pagesCount; i++) {
39+
await call<DocumentPage>(
40+
httpCall: () async =>
41+
await (await academicApi).getImagePage(this.documentId, i + 1),
42+
onSuccess: (data) => pages.add(data),
43+
onCallError: (status) => change(null, status: status),
44+
onError: (e) => change(null, status: RxStatus.error(e.toString())),
45+
);
46+
}
47+
48+
if (pages.isNotEmpty) {
49+
change(pages, status: RxStatus.success());
50+
} else {
51+
change(pages, status: RxStatus.empty());
52+
}
53+
}
54+
}

‎lib/modules/drawer/modules/portal/documents/views/page_documents.dart‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ class DocumentsPage extends GetView<DocumentsController> {
2626
),
2727
];
2828
for (int i = 0; i < archives.length; i++) {
29-
list.add(ButtonDocument(name: archives[i].name));
29+
list.add(ButtonDocument(
30+
id: archives[i].id,
31+
name: archives[i].name,
32+
pagesCount: archives[i].pages.length,
33+
));
3034
}
31-
list.add(SizedBox(
32-
height: 20.0,
33-
));
35+
list.add(
36+
SizedBox(
37+
height: 20.0,
38+
),
39+
);
3440
return list;
3541
}
3642

0 commit comments

Comments
 (0)