Skip to content

Merge commit and master #1

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
Open
wants to merge 265 commits into
base: master
Choose a base branch
from
Open

Merge commit and master #1

wants to merge 265 commits into from

Conversation

cyberwizard1001
Copy link
Member

No description provided.

SooryaSRajan and others added 30 commits October 27, 2021 15:44
@SooryaSRajan
Added custom widget for step counter
8c7e88a
@SooryaSRajan
Added svg assets
6d2292c
@cyberwizard1001
Abstracted pages into separate files as forms
9f7bf96
@cyberwizard1001
FamilyMemberAdd.dart kind of works. StepCounting issues.
ce9ac6e
@SooryaSRajan
made changes to family member add
e063c06
@SooryaSRajan
Added a separate widget for page view with error form and step counte…
61d0a30 
…r widget
@cyberwizard1001
A comment and implemented FamilyMemberAdd.dart
c1e8d36
@cyberwizard1001
Weird error with FamilyMemberAdd() call in IndividualDataCollection.dart
a55e08e
@SooryaSRajan
Added widget with form validation to get current location
b268325
@SooryaSRajan
Modified location widget style
83d26fe
@SooryaSRajan
Added more decoration to step counter widget to highlight current pag…
b4519b2 
…e, and added functionality to navigate to page when clicked on corresponding tiles.
@SooryaSRajan
Added progress bar for location, added submit tab in step counter to …
fb183ed 
…scroll to submit pagge
@SooryaSRajan
Added custom widget for dropdown field with form validation
00d94d2
@cyberwizard1001
Fixed error, added AppTheme.dart
424042c
@cyberwizard1001
Added gender_picker, new widgets to individual data collection
4ab75fe
@cyberwizard1001
Error, needs fixing
97e3c12
@SooryaSRajan
Added widget for options, OptionsFormWidget
ec43a52
@SooryaSRajan
Fixed dropdown bug, added scroll view inside page view to avoid overflow
ba9f097
@cyberwizard1001
Check if onSaved returns value
1e7d732
@cyberwizard1001
Fixed scrollview resize issues
108d61f
@cyberwizard1001
Removed SingleChildScrollView in PageViewContentBox.dart
bcfa191
@cyberwizard1001
Added labels, title constructor to DatePicker.dart
2e9c55b
@cyberwizard1001
Added more widgets
3ea8972
@cyberwizard1001
Preliminary addition for FamilyMemberAdd.dart done
dc8cb13
@cyberwizard1001
Added FamilyDetails.dart and FamilyHomeScreen.dart
0e266fc
@cyberwizard1001
Modified redirects from Home.dart, fixed pixel overflow
15e25ae
@cyberwizard1001
Added widgets
64e0572
@cyberwizard1001
Added keyboard_detector, did login screen styling
95309a7
@SooryaSRajan
Built multi check box list dialog widget, with the choice to choose b…
80375c9 
…etween single and multiple options
@SooryaSRajan
Cloned repo
5d1eb76
cyberwizard1001 and others added 30 commits January 24, 2022 16:56
@cyberwizard1001
Modified, has error in student field. Needs dataModel modification
5d0d1dc
@SooryaSRajan
Fixed bug in Education Drop Down field added in FamilyMemberAdd.dart,…
e7b3d32 
… commented out Edit Page Card in Home.dart
@SooryaSRajan
Added Student and Student education type fields to model and built ob…
aceb2e7 
…jectbox-model.json
@SooryaSRajan
Added parsing methods to new fields in FamilyDataModels.dart
d039570
@SooryaSRajan
Changed Deployment endpoint for testing
eb21423
@SooryaSRajan
Fixed bug which caused data to persist even after closing page
efcdb6b
@SooryaSRajan
Fixed bug in FamilyDataModels.dart which prevented occupationData fro…
1ddc927 
…m being written to the server, fixed a null exception in FamilyDataModels.dart caused when a user data tile was deleted and the head of the family was already chosen. Also implemented auto save, the user doesn't have to slide to the next page to save locally.
@SooryaSRajan
Changed note message in FamilyMemberAdd.dart and FamilyDetails.dart.dart
e44e1a9
@SooryaSRajan
Changed note message for location page
cdc7175
@SooryaSRajan
Fixed issue with keyboard coming up and hiding text views and other w…
6e38e70 
…idgets in certain devices
@SooryaSRajan
Set resizeToAvoidBottomInset to false in places where keyboards are n…
035d9ef 
…ot necessary
@SooryaSRajan
Removed all print statements, removed unused permissions from Android…
68fc519 
…Manifest.xml
@SooryaSRajan
Added keygen code in gradle
9505a64
@SooryaSRajan
Removed all redundant storage accessing fields, modularised all redun…
fc259e5 
…ant dialog functions
@SooryaSRajan
Added TODO
853de6f
@SooryaSRajan
Removed redundant theme styles
9ab04a1
@SooryaSRajan
Removed elevation from IncomeWithTypeTextField.dart dropdown to match…
f45379f 
… other fields
@SooryaSRajan
Changed host URL
282e750
@SooryaSRajan
Removed local auth library
c1bbc0e
@SooryaSRajan
Added icons for iOS and Android manually
aa9b990
@SooryaSRajan
Added icon background color asset in android values folder
af75ecb
@SooryaSRajan
Added logic to signout account on invalid JWT usage, i.e, when passwo…
5aea8b2 
…rds are changed or user deleted. Modularised logout logic.
@SooryaSRajan
Updated version number
1421c69
@SooryaSRajan
Removed unused libraries
2e32ff6
@SooryaSRajan
Uncommented JWT saving code in ChangePassword.dart
20e73ad
@SooryaSRajan
Added logout logic in ChangePassword.dart when invalid token detected
e21ba2a
@SooryaSRajan
Added new village code
4d70ed8
@SooryaSRajan
Added DisplayUploadData page to show paths to village and community data
cd74ec0 
Added DiaplayUploadedVillageData to show list of all villages uploaded
Changed edit records to DisplayUploadedFamilyData.dart
Built new widget to render json data into widgets
@SooryaSRajan
Added logic and dialog to delete records entered by the user through …
02e253d 
…the application
@SooryaSRajan
Changed URL to Amrita server and downgraded connection to HTTP
b26eaaa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cyberwizard1001 @SooryaSRajan