From 319d91bfa562cbcef9ce68bacb49303c490fcf66 Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Sat, 31 Oct 2020 02:04:41 +0530 Subject: [PATCH 1/2] chore: remove unneeded web files --- navft/web/favicon.png | Bin 917 -> 0 bytes navft/web/icons/Icon-192.png | Bin 5292 -> 0 bytes navft/web/icons/Icon-512.png | Bin 8252 -> 0 bytes navft/web/index.html | 33 --------------------------------- navft/web/manifest.json | 23 ----------------------- 5 files changed, 56 deletions(-) delete mode 100644 navft/web/favicon.png delete mode 100644 navft/web/icons/Icon-192.png delete mode 100644 navft/web/icons/Icon-512.png delete mode 100644 navft/web/index.html delete mode 100644 navft/web/manifest.json diff --git a/navft/web/favicon.png b/navft/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/navft/web/icons/Icon-192.png b/navft/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/navft/web/icons/Icon-512.png b/navft/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/navft/web/index.html b/navft/web/index.html deleted file mode 100644 index 12b1b12..0000000 --- a/navft/web/index.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - navft - - - - - - - - diff --git a/navft/web/manifest.json b/navft/web/manifest.json deleted file mode 100644 index 086b826..0000000 --- a/navft/web/manifest.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "navft", - "short_name": "navft", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter application.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - } - ] -} From 0be3a2819ed115d931aa438898f56745c1318096 Mon Sep 17 00:00:00 2001 From: Abhijit Ramesh Date: Sat, 31 Oct 2020 07:24:31 +0530 Subject: [PATCH 2/2] feat questionare --- .../satisfaction_with_life_scale.json | 201 ++++++++++++++++++ navft/lib/{login => }/CustomIcons.dart | 0 navft/lib/enums/questionnaire_type.dart | 3 + navft/lib/main.dart | 2 +- navft/lib/models/answer.dart | 24 +++ .../{design_course => }/models/category.dart | 0 navft/lib/models/interpretation.dart | 24 +++ navft/lib/models/question.dart | 26 +++ navft/lib/models/questionnaire.dart | 36 ++++ .../design_course_app_theme.dart | 0 .../home_design_course.dart | 2 +- navft/lib/{login => screens}/login.dart | 4 +- .../popular_course_list_view.dart | 42 +++- navft/lib/screens/questionnaire_screen.dart | 199 +++++++++++++++++ navft/lib/screens/result_screen.dart | 58 +++++ navft/lib/services/questionnaire_service.dart | 22 ++ .../{login/Widgets => widgets}/FormCard.dart | 0 navft/lib/widgets/button.dart | 43 ++++ navft/pubspec.lock | 52 +++-- navft/pubspec.yaml | 2 + 20 files changed, 713 insertions(+), 27 deletions(-) create mode 100644 navft/assets/questionnaires/satisfaction_with_life_scale.json rename navft/lib/{login => }/CustomIcons.dart (100%) create mode 100644 navft/lib/enums/questionnaire_type.dart create mode 100644 navft/lib/models/answer.dart rename navft/lib/{design_course => }/models/category.dart (100%) create mode 100644 navft/lib/models/interpretation.dart create mode 100644 navft/lib/models/question.dart create mode 100644 navft/lib/models/questionnaire.dart rename navft/lib/{design_course => screens}/design_course_app_theme.dart (100%) rename navft/lib/{design_course => screens}/home_design_course.dart (98%) rename navft/lib/{login => screens}/login.dart (98%) rename navft/lib/{design_course => screens}/popular_course_list_view.dart (79%) create mode 100644 navft/lib/screens/questionnaire_screen.dart create mode 100644 navft/lib/screens/result_screen.dart create mode 100644 navft/lib/services/questionnaire_service.dart rename navft/lib/{login/Widgets => widgets}/FormCard.dart (100%) create mode 100644 navft/lib/widgets/button.dart diff --git a/navft/assets/questionnaires/satisfaction_with_life_scale.json b/navft/assets/questionnaires/satisfaction_with_life_scale.json new file mode 100644 index 0000000..9b5d8f3 --- /dev/null +++ b/navft/assets/questionnaires/satisfaction_with_life_scale.json @@ -0,0 +1,201 @@ +{ + "name": "Satisfaction with Life Scale", + "instructions": "Please indicate your agreement or disagreement with the following statement. Please be open and honest in your responding.", + "questions": [ + { + "text": "In most ways my life is close to my ideal.", + "answers": [ + { + "text": "Strongly agree", + "score": 7 + }, + { + "text": "Agree", + "score": 6 + }, + { + "text": "Slightly agree", + "score": 5 + }, + { + "text": "Neither agree nor disagree", + "score": 4 + }, + { + "text": "Slightly disagree", + "score": 3 + }, + { + "text": "Disagree", + "score": 2 + }, + { + "text": "Strongly disagree", + "score": 1 + } + ] + }, + { + "text": "The conditions of my life are excellent.", + "answers": [ + { + "text": "Strongly agree", + "score": 7 + }, + { + "text": "Agree", + "score": 6 + }, + { + "text": "Slightly agree", + "score": 5 + }, + { + "text": "Neither agree nor disagree", + "score": 4 + }, + { + "text": "Slightly disagree", + "score": 3 + }, + { + "text": "Disagree", + "score": 2 + }, + { + "text": "Strongly disagree", + "score": 1 + } + ] + }, + { + "text": "I am satisfied with my life.", + "answers": [ + { + "text": "Strongly agree", + "score": 7 + }, + { + "text": "Agree", + "score": 6 + }, + { + "text": "Slightly agree", + "score": 5 + }, + { + "text": "Neither agree nor disagree", + "score": 4 + }, + { + "text": "Slightly disagree", + "score": 3 + }, + { + "text": "Disagree", + "score": 2 + }, + { + "text": "Strongly disagree", + "score": 1 + } + ] + }, + { + "text": "So far I have gotten the important things I want in life.", + "answers": [ + { + "text": "Strongly agree", + "score": 7 + }, + { + "text": "Agree", + "score": 6 + }, + { + "text": "Slightly agree", + "score": 5 + }, + { + "text": "Neither agree nor disagree", + "score": 4 + }, + { + "text": "Slightly disagree", + "score": 3 + }, + { + "text": "Disagree", + "score": 2 + }, + { + "text": "Strongly disagree", + "score": 1 + } + ] + }, + { + "text": "If I could live my life over, I would change almost nothing.", + "answers": [ + { + "text": "Strongly agree", + "score": 7 + }, + { + "text": "Agree", + "score": 6 + }, + { + "text": "Slightly agree", + "score": 5 + }, + { + "text": "Neither agree nor disagree", + "score": 4 + }, + { + "text": "Slightly disagree", + "score": 3 + }, + { + "text": "Disagree", + "score": 2 + }, + { + "text": "Strongly disagree", + "score": 1 + } + ] + } + ], + "interpretations": [ + { + "score": 31, + "text": "Extremely satisfied" + }, + { + "score": 26, + "text": "Satisfied" + }, + { + "score": 21, + "text": "Slightly satisfied" + }, + { + "score": 20, + "text": "Neutral" + }, + { + "score": 15, + "text": "Slightly dissatisfied" + }, + { + "score": 10, + "text": "Dissatisfied" + }, + { + "score": 5, + "text": "Extremely dissatisfied" + } + ] +} \ No newline at end of file diff --git a/navft/lib/login/CustomIcons.dart b/navft/lib/CustomIcons.dart similarity index 100% rename from navft/lib/login/CustomIcons.dart rename to navft/lib/CustomIcons.dart diff --git a/navft/lib/enums/questionnaire_type.dart b/navft/lib/enums/questionnaire_type.dart new file mode 100644 index 0000000..ce3de14 --- /dev/null +++ b/navft/lib/enums/questionnaire_type.dart @@ -0,0 +1,3 @@ +enum QuestionnaireType { + satisfaction, +} \ No newline at end of file diff --git a/navft/lib/main.dart b/navft/lib/main.dart index 7b9bcf4..a332f47 100644 --- a/navft/lib/main.dart +++ b/navft/lib/main.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'app_theme.dart'; -import 'login/login.dart'; +import 'screens/login.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/navft/lib/models/answer.dart b/navft/lib/models/answer.dart new file mode 100644 index 0000000..85ae82c --- /dev/null +++ b/navft/lib/models/answer.dart @@ -0,0 +1,24 @@ +import 'package:meta/meta.dart'; + +class Answer { + final int score; + final String text; + + Answer({ + @required this.score, + @required this.text, + }); + + factory Answer.fromJson(Map json) => Answer( + score: json['score'], + text: json['text'], + ); + + Map toJson() => { + 'score': score, + 'text': text, + }; + + @override + String toString() => toJson().toString(); +} diff --git a/navft/lib/design_course/models/category.dart b/navft/lib/models/category.dart similarity index 100% rename from navft/lib/design_course/models/category.dart rename to navft/lib/models/category.dart diff --git a/navft/lib/models/interpretation.dart b/navft/lib/models/interpretation.dart new file mode 100644 index 0000000..45c7f11 --- /dev/null +++ b/navft/lib/models/interpretation.dart @@ -0,0 +1,24 @@ +import 'package:meta/meta.dart'; + +class Interpretation { + final int score; + final String text; + + Interpretation({ + @required this.score, + @required this.text, + }); + + factory Interpretation.fromJson(Map json) => Interpretation( + score: json['score'], + text: json['text'], + ); + + Map toJson() => { + 'score': score, + 'text': text, + }; + + @override + String toString() => toJson().toString(); +} diff --git a/navft/lib/models/question.dart b/navft/lib/models/question.dart new file mode 100644 index 0000000..767b21a --- /dev/null +++ b/navft/lib/models/question.dart @@ -0,0 +1,26 @@ +import 'package:meta/meta.dart'; + +import 'answer.dart'; + +class Question { + final String text; + final List answers; + + Question({ + @required this.text, + @required this.answers, + }); + + factory Question.fromJson(Map json) => Question( + text: json['text'], + answers: List.from(json['answers'].map((x) => Answer.fromJson(x))), + ); + + Map toJson() => { + 'text': text, + 'answers': List.from(answers.map((x) => x.toJson())), + }; + + @override + String toString() => toJson().toString(); +} diff --git a/navft/lib/models/questionnaire.dart b/navft/lib/models/questionnaire.dart new file mode 100644 index 0000000..e04619d --- /dev/null +++ b/navft/lib/models/questionnaire.dart @@ -0,0 +1,36 @@ +import 'package:meta/meta.dart'; +import 'package:navft/models/question.dart'; + +import 'interpretation.dart'; + + +class Questionnaire { + final String name; + final String instructions; + final List questions; + final List interpretations; + + Questionnaire({ + @required this.name, + @required this.instructions, + @required this.questions, + @required this.interpretations, + }); + + factory Questionnaire.fromJson(Map json) => Questionnaire( + name: json['name'], + instructions: json['instructions'], + questions: List.from(json['questions'].map((x) => Question.fromJson(x))), + interpretations: List.from(json['interpretations'].map((x) => Interpretation.fromJson(x))), + ); + + Map toJson() => { + 'name': name, + 'instructions': instructions, + 'questions': List.from(questions.map((x) => x.toJson())), + 'interpretations': List.from(interpretations.map((x) => x.toJson())), + }; + + @override + String toString() => toJson().toString(); +} diff --git a/navft/lib/design_course/design_course_app_theme.dart b/navft/lib/screens/design_course_app_theme.dart similarity index 100% rename from navft/lib/design_course/design_course_app_theme.dart rename to navft/lib/screens/design_course_app_theme.dart diff --git a/navft/lib/design_course/home_design_course.dart b/navft/lib/screens/home_design_course.dart similarity index 98% rename from navft/lib/design_course/home_design_course.dart rename to navft/lib/screens/home_design_course.dart index c9f90fb..422a7a8 100644 --- a/navft/lib/design_course/home_design_course.dart +++ b/navft/lib/screens/home_design_course.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:navft/design_course/popular_course_list_view.dart'; +import 'package:navft/screens/popular_course_list_view.dart'; import '../main.dart'; import 'design_course_app_theme.dart'; diff --git a/navft/lib/login/login.dart b/navft/lib/screens/login.dart similarity index 98% rename from navft/lib/login/login.dart rename to navft/lib/screens/login.dart index 4f6abfa..32f2076 100644 --- a/navft/lib/login/login.dart +++ b/navft/lib/screens/login.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import '../design_course/home_design_course.dart'; -import './Widgets/FormCard.dart'; +import 'package:navft/screens/home_design_course.dart'; +import '../widgets/FormCard.dart'; class Login extends StatefulWidget { @override diff --git a/navft/lib/design_course/popular_course_list_view.dart b/navft/lib/screens/popular_course_list_view.dart similarity index 79% rename from navft/lib/design_course/popular_course_list_view.dart rename to navft/lib/screens/popular_course_list_view.dart index bdc91b0..cbd2974 100644 --- a/navft/lib/design_course/popular_course_list_view.dart +++ b/navft/lib/screens/popular_course_list_view.dart @@ -1,9 +1,18 @@ +import 'dart:convert'; + import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:navft/enums/questionnaire_type.dart'; +import 'package:navft/models/answer.dart'; +import 'package:navft/models/interpretation.dart'; +import 'package:navft/models/question.dart'; +import 'package:navft/models/questionnaire.dart'; +import 'package:navft/screens/questionnaire_screen.dart'; +import 'package:navft/services/questionnaire_service.dart'; import '../main.dart'; import 'design_course_app_theme.dart'; -import 'models/category.dart'; - +import "package:navft/models/category.dart"; class PopularCourseListView extends StatefulWidget { const PopularCourseListView({Key key, this.callBack}) : super(key: key); @@ -27,6 +36,7 @@ class _PopularCourseListViewState extends State return true; } + @override Widget build(BuildContext context) { return Padding( @@ -48,9 +58,11 @@ class _PopularCourseListViewState extends State final Animation animation = Tween(begin: 0.0, end: 1.0).animate( CurvedAnimation( + parent: animationController, curve: Interval((1 / count) * index, 1.0, curve: Curves.fastOutSlowIn), + ), ); animationController.forward(); @@ -62,8 +74,11 @@ class _PopularCourseListViewState extends State animation: animation, animationController: animationController, ); + }, + ), + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, mainAxisSpacing: 32.0, @@ -84,7 +99,7 @@ class CategoryView extends StatelessWidget { this.category, this.animationController, this.animation, - this.callback}) + this.callback,}) : super(key: key); final VoidCallback callback; @@ -92,6 +107,7 @@ class CategoryView extends StatelessWidget { final AnimationController animationController; final Animation animation; + @override Widget build(BuildContext context) { return AnimatedBuilder( @@ -105,7 +121,25 @@ class CategoryView extends StatelessWidget { child: InkWell( splashColor: Colors.transparent, onTap: () { - callback(); + if(this.category.title=="Pending Inspections List") + Navigator.of(context).push( + MaterialPageRoute( + builder: (context) => + QuestionnaireScreen( + questionnaire: Questionnaire( + name: "Pending Test", interpretations: [ + Interpretation(score: 1, text: "Test Passed") + ], questions: [ + Question(text: "Is the test done properly", answers: [Answer(score: 0 ,text: "No"),Answer(score: 1 ,text: "Yes")]), + Question(text: "Is the test done properly", answers: [Answer(score: 0 ,text: "No"),Answer(score: 1 ,text: "Yes")]), + Question(text: "Is the test done properly", answers: [Answer(score: 0 ,text: "No"),Answer(score: 1 ,text: "Yes")]), + Question(text: "Is the test done properly", answers: [Answer(score: 0 ,text: "No"),Answer(score: 1 ,text: "Yes")]), + Question(text: "Is the test done properly", answers: [Answer(score: 0 ,text: "No"),Answer(score: 1 ,text: "Yes")]), + ], instructions: "Please select the right options" + ) + ), + ), + ); }, child: SizedBox( height: 280, diff --git a/navft/lib/screens/questionnaire_screen.dart b/navft/lib/screens/questionnaire_screen.dart new file mode 100644 index 0000000..78bd7bd --- /dev/null +++ b/navft/lib/screens/questionnaire_screen.dart @@ -0,0 +1,199 @@ +import 'package:dots_indicator/dots_indicator.dart'; +import 'package:flutter/material.dart'; +import 'package:grouped_buttons/grouped_buttons.dart'; +import 'package:navft/models/answer.dart'; +import 'package:navft/models/interpretation.dart'; +import 'package:navft/models/question.dart'; +import 'package:navft/models/questionnaire.dart'; +import 'package:navft/screens/result_screen.dart'; +import 'package:navft/widgets/button.dart'; + +class QuestionnaireScreen extends StatefulWidget { + final Questionnaire questionnaire; + + QuestionnaireScreen({@required this.questionnaire}); + + @override + _QuestionnaireScreenState createState() => _QuestionnaireScreenState(); +} + +class _QuestionnaireScreenState extends State { + List get questions => widget.questionnaire.questions; + int questionIndex; + + Question get currentQuestion => questions[questionIndex]; + + int get numberOfQuestions => questions.length; + List chosenAnswers; + + bool get userHasAnsweredCurrentQuestion => + chosenAnswers[questionIndex] != null; + + String get instructions => widget.questionnaire.instructions; + + String getResultInterpretation() { + // calculate user's total score + int result = 0; + for (int index = 0; index < numberOfQuestions; index++) { + Question question = questions[index]; + int answerIndex = chosenAnswers[index]; + Answer answer = question.answers[answerIndex]; + int score = answer.score; + + result += score; + } + + // determine interpretation for result + List interpretations = widget.questionnaire.interpretations; + for (Interpretation interpretation in interpretations) { + if (result >= interpretation.score) { + return interpretation.text; + } + } + + // if something went wrong, return the worst interpretation + return interpretations.last.text; + } + + @override + void initState() { + super.initState(); + + questionIndex = 0; + chosenAnswers = List(numberOfQuestions); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(widget.questionnaire.name), + ), + body: SafeArea( + child: SingleChildScrollView( + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only(left: 20.0, right: 20.0, top: 20.0), + child: Text( + instructions, + textAlign: TextAlign.justify, + style: TextStyle( + fontSize: 15, + fontWeight: FontWeight.w500, + color: Theme.of(context).accentColor, + ), + ), + ), + Padding( + padding: const EdgeInsets.all(15.0), + child: Card( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 16, + ), + Center( + child: DotsIndicator( + dotsCount: numberOfQuestions, + position: questionIndex.toDouble(), + decorator: DotsDecorator( + size: Size.square(15), + activeSize: Size(18, 18), + activeColor: Theme.of(context).primaryColor, + color: Theme.of(context).disabledColor, + ), + ), + ), + SizedBox( + height: 24, + ), + Padding( + padding: const EdgeInsets.only(left: 30.0, right: 8.0), + child: Text( + currentQuestion.text, + style: TextStyle( + fontSize: 20, fontWeight: FontWeight.w700), + textAlign: TextAlign.left, + ), + ), + SizedBox( + height: 24, + ), + RadioButtonGroup( + activeColor: Theme.of(context).primaryColor, + labels: currentQuestion.answers + .map((answer) => answer.text) + .toList(), + onChange: (_, answerIndex) => setState(() { + chosenAnswers[questionIndex] = answerIndex; + }), + picked: !userHasAnsweredCurrentQuestion + ? "" + : currentQuestion + .answers[chosenAnswers[questionIndex]].text, + ), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.only(bottom: 20.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Visibility( + visible: questionIndex != 0, + child: Button.accent( + buttonLabel: 'Back', + onPressed: onBackButtonPressed, + ), + ), + Button.primary( + buttonLabel: 'Next', + onPressed: userHasAnsweredCurrentQuestion + ? onNextButtonPressed + : null, + ) + ], + ), + ), + ], + ), + ), + ), + ], + ), + ), + ), + ); + } + + void onNextButtonPressed() { + if (questionIndex < numberOfQuestions - 1) { + setState(() { + questionIndex++; + }); + } else { + Navigator.pushReplacement( + context, + MaterialPageRoute( + builder: (context) => ResultScreen( + questionnaireName: widget.questionnaire.name, + interpretation: getResultInterpretation(), + ), + ), + ); + } + } + + void onBackButtonPressed() { + if (questionIndex > 0) { + setState(() { + questionIndex--; + }); + } + } +} diff --git a/navft/lib/screens/result_screen.dart b/navft/lib/screens/result_screen.dart new file mode 100644 index 0000000..93e98f3 --- /dev/null +++ b/navft/lib/screens/result_screen.dart @@ -0,0 +1,58 @@ +import 'package:flutter/material.dart'; +import 'package:navft/widgets/button.dart'; + +class ResultScreen extends StatelessWidget { + final String questionnaireName; + final String interpretation; + + ResultScreen({@required this.questionnaireName, this.interpretation}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(questionnaireName), + ), + body: SafeArea( + child: Center( + child: LayoutBuilder( + builder: (context, constraints) { + return Container( + width: constraints.maxWidth * 0.75, + height: constraints.maxHeight * 0.5, + child: Card( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: const EdgeInsets.only(top: 40.0, bottom: 20), + child: Text( + 'Your Result:', + textAlign: TextAlign.center, + style: TextStyle(fontSize: 20, fontWeight: FontWeight.normal), + ), + ), + Text( + interpretation, + style: TextStyle(fontSize: 15, fontWeight: FontWeight.w700), + ), + SizedBox(height: 20), + Padding( + padding: const EdgeInsets.only(bottom: 16.0), + child: Button.primary( + buttonLabel: 'Main Menu', + onPressed: () => Navigator.of(context).pop(), + ), + ), + ], + // + ), + ), + ); + }, + ), + ), + ), + ); + } +} diff --git a/navft/lib/services/questionnaire_service.dart b/navft/lib/services/questionnaire_service.dart new file mode 100644 index 0000000..48d3279 --- /dev/null +++ b/navft/lib/services/questionnaire_service.dart @@ -0,0 +1,22 @@ +import 'dart:convert'; +import 'package:flutter/services.dart'; +import 'package:navft/enums/questionnaire_type.dart'; +import 'package:navft/models/questionnaire.dart'; + +class QuestionnaireService { + String _getQuestionnaireAssetPath(QuestionnaireType questionnaireType) { + switch (questionnaireType) { + case QuestionnaireType.satisfaction: + return 'assets/questionnaires/satisfaction_with_life_scale.json'; + default: + return null; + } + } + + Future getQuestionnaire(QuestionnaireType questionnaireType) async { + final assetPath = _getQuestionnaireAssetPath(questionnaireType); + final jsonData = await rootBundle.loadString(assetPath); + final jsonDataDecoded = jsonDecode(jsonData); + return Questionnaire.fromJson(jsonDataDecoded); + } +} \ No newline at end of file diff --git a/navft/lib/login/Widgets/FormCard.dart b/navft/lib/widgets/FormCard.dart similarity index 100% rename from navft/lib/login/Widgets/FormCard.dart rename to navft/lib/widgets/FormCard.dart diff --git a/navft/lib/widgets/button.dart b/navft/lib/widgets/button.dart new file mode 100644 index 0000000..3e7bfaf --- /dev/null +++ b/navft/lib/widgets/button.dart @@ -0,0 +1,43 @@ +import 'package:flutter/material.dart'; + +class Button extends StatelessWidget { + final String buttonLabel; + final Function onPressed; + final bool isPrimary; + + Button.primary({ + @required this.buttonLabel, + @required this.onPressed, + }) : isPrimary = true; + + Button.accent({ + @required this.buttonLabel, + @required this.onPressed, + }) : isPrimary = false; + + @override + Widget build(BuildContext context) { + return RaisedButton( + color: isPrimary ? Theme.of(context).primaryColor : Theme.of(context).accentColor, + shape: isPrimary + ? null + : RoundedRectangleBorder( + side: BorderSide( + color: Theme.of(context).disabledColor, + ), + ), + child: Text( + buttonLabel, + style: isPrimary + ? TextStyle( + fontWeight: FontWeight.w700, + color: Theme.of(context).accentColor, + ) + : TextStyle( + fontWeight: FontWeight.w700, + ), + ), + onPressed: onPressed, + ); + } +} diff --git a/navft/pubspec.lock b/navft/pubspec.lock index 3d2d16b..0fa0ed8 100644 --- a/navft/pubspec.lock +++ b/navft/pubspec.lock @@ -7,42 +7,42 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety" + version: "2.5.0-nullsafety.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0-nullsafety.1" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.2" + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0-nullsafety.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.2" + version: "1.15.0-nullsafety.3" cupertino_icons: dependency: "direct main" description: @@ -50,13 +50,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + dots_indicator: + dependency: "direct main" + description: + name: dots_indicator + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.2.0-nullsafety.1" flutter: dependency: "direct main" description: flutter @@ -81,6 +88,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "8.10.0" + grouped_buttons: + dependency: "direct main" + description: + name: grouped_buttons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" intl: dependency: "direct main" description: @@ -94,21 +108,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0-nullsafety.3" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0-nullsafety.1" sky_engine: dependency: transitive description: flutter @@ -127,55 +141,55 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety" + version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.2" + version: "2.1.0-nullsafety.3" sdks: - dart: ">=2.10.0-0.0.dev <2.10.0" + dart: ">=2.10.0-110 <2.11.0" diff --git a/navft/pubspec.yaml b/navft/pubspec.yaml index 40cd7de..585993a 100644 --- a/navft/pubspec.yaml +++ b/navft/pubspec.yaml @@ -32,6 +32,8 @@ dependencies: smooth_star_rating: ^1.1.1 intl: ^0.16.0 flutter_screenutil: ^0.5.2 + grouped_buttons: ^1.0.4 + dots_indicator: ^1.1.0 dev_dependencies: flutter_test: