From 2a6f420b23bbd6c5fd2d96b85b129f8510fcb0b2 Mon Sep 17 00:00:00 2001
From: shoaib-mohmad <shoaib.mohmad@tarento.com>
Date: Tue, 22 Feb 2022 17:52:25 +0530
Subject: [PATCH] Work in progress.
---
l10n.yaml | 3 +
lib/constants/api_endpoints.dart | 2 +
lib/constants/app_constants.dart | 25 +-
lib/l10n/app_en.arb | 17 +
lib/landing_page.dart | 27 +
lib/models/application_model.dart | 4 +
lib/models/form_model.dart | 40 ++
lib/pages/application_details_page.dart | 186 ++++---
lib/pages/home_page.dart | 174 ++++---
lib/pages/inspection_summary.dart | 474 ++++++++----------
lib/pages/login_email_page.dart | 17 +-
lib/pages/login_otp_page.dart | 13 +-
lib/pages/past_applications.dart | 3 +-
lib/repositories/application_repository.dart | 1 -
lib/repositories/form_repository.dart | 28 ++
lib/repositories/user_repository.dart | 31 ++
lib/services/application_service.dart | 15 +-
lib/services/base_service.dart | 15 +
lib/services/form_service.dart | 21 +
lib/services/login_service.dart | 5 +-
lib/services/user_service.dart | 27 +
lib/util/helper.dart | 12 -
lib/widgets/application_card.dart | 42 +-
lib/widgets/application_field.dart | 273 +++++-----
lib/widgets/application_field_dialog.dart | 206 ++++++++
lib/widgets/people_card.dart | 92 ++++
.../questions/multi_select_question.dart | 170 +++++++
.../questions/single_answer_question.dart | 87 ++++
lib/widgets/questions/text_question.dart | 86 ++++
pubspec.lock | 5 +
pubspec.yaml | 4 +-
31 files changed, 1494 insertions(+), 611 deletions(-)
create mode 100644 l10n.yaml
create mode 100644 lib/l10n/app_en.arb
create mode 100644 lib/models/form_model.dart
create mode 100644 lib/repositories/form_repository.dart
create mode 100644 lib/repositories/user_repository.dart
create mode 100644 lib/services/form_service.dart
create mode 100644 lib/services/user_service.dart
create mode 100644 lib/widgets/application_field_dialog.dart
create mode 100644 lib/widgets/people_card.dart
create mode 100644 lib/widgets/questions/multi_select_question.dart
create mode 100644 lib/widgets/questions/single_answer_question.dart
create mode 100644 lib/widgets/questions/text_question.dart
diff --git a/l10n.yaml b/l10n.yaml
new file mode 100644
index 0000000..4e6692e
--- /dev/null
+++ b/l10n.yaml
@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart
\ No newline at end of file
diff --git a/lib/constants/api_endpoints.dart b/lib/constants/api_endpoints.dart
index 991077a..c0293d4 100644
--- a/lib/constants/api_endpoints.dart
+++ b/lib/constants/api_endpoints.dart
@@ -4,4 +4,6 @@ class ApiUrl {
static const validateOtp = '$baseUrl/api/signIn';
static const getAllApplications = '$baseUrl/api/forms/getAllApplications';
static const submitInspection = '$baseUrl/api/forms/submitInspection';
+ static const getAllUsers = '$baseUrl/api/user/v1/getAllUser';
+ static const getFormDetails = '$baseUrl/api/forms/getFormById?id=';
}
diff --git a/lib/constants/app_constants.dart b/lib/constants/app_constants.dart
index c25c771..d8e4235 100644
--- a/lib/constants/app_constants.dart
+++ b/lib/constants/app_constants.dart
@@ -1,8 +1,23 @@
const String appVersion = '1.0';
const String appName = 'UP SMF';
+const int inspectorRoleId = 2093;
-// class Status {
-// static const String active = 'active';
-// static const String completed = 'completed';
-// static const String deleted = 'deleted';
-// }
+class FieldType {
+ static const String text = "text";
+ static const String date = "date";
+ static const String email = "email";
+ static const String numeric = "numeric";
+ static const String textarea = "textarea";
+ static const String dropdown = "dropdown";
+ static const String multiselect = "multiselect";
+ static const String checkbox = "checkbox";
+ static const String radio = "radio";
+ static const String boolean = "boolean";
+ static const String file = "file";
+ static const String heading = 'heading';
+}
+
+class InspectionStatus {
+ static const String sentForInspection = 'SENTFORINS';
+ static const String inspectionCompleted = 'INSCOMPLETED';
+}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
new file mode 100644
index 0000000..23d7cae
--- /dev/null
+++ b/lib/l10n/app_en.arb
@@ -0,0 +1,17 @@
+{
+ "login": "Login",
+ "emailId": "Email Id",
+ "getOtp": "GET OTP",
+ "enterOtp": "Enter OTP",
+ "otpFieldDescription": "Enter the 6 digit OTP sent to your email address.",
+ "signIn": "SIGN IN",
+ "goBackText": "Go back, re-enter the email",
+ "pendingApplications": "Pending applications",
+ "today": "Today",
+ "upcoming": "Upcoming",
+ "pastApplications": "Past applications",
+ "viewPastApplications": "View past applications",
+ "next": "Next",
+ "previous": "previous",
+ "inspectionCompleted": "Inspection completed"
+}
\ No newline at end of file
diff --git a/lib/landing_page.dart b/lib/landing_page.dart
index 801e467..5500a1a 100644
--- a/lib/landing_page.dart
+++ b/lib/landing_page.dart
@@ -1,25 +1,39 @@
import 'dart:io';
import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:provider/provider.dart';
import 'package:smf_mobile/pages/home_page.dart';
import 'package:smf_mobile/pages/login_email_page.dart';
import 'package:smf_mobile/repositories/application_repository.dart';
+import 'package:smf_mobile/repositories/form_repository.dart';
import 'package:smf_mobile/repositories/login_repository.dart';
+import 'package:smf_mobile/repositories/user_repository.dart';
import 'constants/app_constants.dart';
import 'constants/app_urls.dart';
import 'constants/color_constants.dart';
import 'routes.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class LandingPage extends StatefulWidget {
static const route = AppUrl.landingPage;
const LandingPage({Key? key}) : super(key: key);
+
@override
_LandingPageState createState() => _LandingPageState();
+ static _LandingPageState? of(BuildContext context) =>
+ context.findAncestorStateOfType<_LandingPageState>();
}
class _LandingPageState extends State<LandingPage> {
final client = HttpClient();
+ Locale _locale = const Locale('en', 'US');
+
+ void setLocale(Locale value) {
+ setState(() {
+ _locale = value;
+ });
+ }
@override
Widget build(BuildContext context) {
@@ -27,9 +41,22 @@ class _LandingPageState extends State<LandingPage> {
providers: [
ChangeNotifierProvider.value(value: LoginRespository()),
ChangeNotifierProvider.value(value: ApplicationRespository()),
+ ChangeNotifierProvider.value(value: UserRespository()),
+ ChangeNotifierProvider.value(value: FormRespository()),
],
child: MaterialApp(
title: appName,
+ locale: _locale,
+ localizationsDelegates: const [
+ AppLocalizations.delegate,
+ GlobalMaterialLocalizations.delegate,
+ GlobalWidgetsLocalizations.delegate,
+ GlobalCupertinoLocalizations.delegate,
+ ],
+ supportedLocales: const [
+ Locale('en', 'US'),
+ // Locale('es', 'ES'),
+ ],
theme: ThemeData(
scaffoldBackgroundColor: AppColors.scaffoldBackground,
primaryColor: Colors.white,
diff --git a/lib/models/application_model.dart b/lib/models/application_model.dart
index 7ff923d..a515a05 100644
--- a/lib/models/application_model.dart
+++ b/lib/models/application_model.dart
@@ -8,6 +8,7 @@ class Application {
final String status;
final Map dataObject;
final List inspectors;
+ final List leadInspector;
final String scheduledDate;
final String createdDate;
final String createdBy;
@@ -20,6 +21,7 @@ class Application {
required this.status,
required this.dataObject,
required this.inspectors,
+ required this.leadInspector,
required this.scheduledDate,
required this.createdDate,
required this.createdBy,
@@ -34,6 +36,7 @@ class Application {
status: json['status'],
dataObject: json['dataObject'],
inspectors: json['inspection']['assignedTo'] ?? [],
+ leadInspector: json['inspection']['leadInspector'] ?? [],
scheduledDate: json['inspection']['scheduledDate'] ?? '',
createdDate: json['createdDate'] != null
? DateFormat.yMMMEd().format(DateTime.parse(json['createdDate']))
@@ -50,6 +53,7 @@ class Application {
status,
dataObject,
inspectors,
+ leadInspector,
scheduledDate,
createdDate,
createdBy
diff --git a/lib/models/form_model.dart b/lib/models/form_model.dart
new file mode 100644
index 0000000..b30851e
--- /dev/null
+++ b/lib/models/form_model.dart
@@ -0,0 +1,40 @@
+class FormData {
+ final int id;
+ final int version;
+ final String title;
+ final String description;
+ final List<dynamic> fields;
+ final List<dynamic> inspectionFields;
+ final int updatedDate;
+
+ const FormData({
+ required this.id,
+ required this.version,
+ required this.title,
+ required this.description,
+ required this.fields,
+ required this.inspectionFields,
+ required this.updatedDate,
+ });
+
+ factory FormData.fromJson(Map<String, dynamic> json) {
+ return FormData(
+ id: json['id'],
+ version: json['version'],
+ title: json['title'],
+ description: json['description'],
+ fields: json['fields'] ?? [],
+ inspectionFields: json['inspectionFields'] ?? [],
+ updatedDate: json['updatedDate']);
+ }
+
+ List<Object> get props => [
+ id,
+ version,
+ title,
+ description,
+ fields,
+ inspectionFields,
+ updatedDate,
+ ];
+}
diff --git a/lib/pages/application_details_page.dart b/lib/pages/application_details_page.dart
index 19650a5..5828389 100644
--- a/lib/pages/application_details_page.dart
+++ b/lib/pages/application_details_page.dart
@@ -1,25 +1,23 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
import 'package:smf_mobile/constants/color_constants.dart';
+import 'package:smf_mobile/models/application_model.dart';
+import 'package:smf_mobile/models/form_model.dart';
import 'package:smf_mobile/pages/inspection_summary.dart';
import 'package:smf_mobile/pages/login_email_page.dart';
-import 'package:smf_mobile/repositories/application_repository.dart';
+import 'package:smf_mobile/repositories/form_repository.dart';
import 'package:smf_mobile/util/helper.dart';
import 'package:smf_mobile/widgets/application_field.dart';
import 'package:smf_mobile/widgets/silverappbar_delegate.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class ApplicationDetailsPage extends StatefulWidget {
- final String applicationId;
- final String applicationTitle;
- final Map applicationFields;
- final List applicationInspectors;
+ final Application application;
const ApplicationDetailsPage({
Key? key,
- required this.applicationId,
- required this.applicationTitle,
- required this.applicationFields,
- required this.applicationInspectors,
+ required this.application,
}) : super(key: key);
@override
@@ -30,30 +28,53 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
with SingleTickerProviderStateMixin {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
TabController? _tabController;
+ late FormData _formData;
int _activeTabIndex = 0;
final Map _data = {};
+ final Map _fieldTypes = {};
final List<String> _tabs = [];
final List<Map> _fields = [];
- String _errorMessage = '';
@override
void initState() {
super.initState();
- widget.applicationFields.forEach((key, value) => _tabs.add(key));
+
+ widget.application.dataObject.forEach((key, value) => _tabs.add(key));
_tabController = TabController(vsync: this, length: _tabs.length);
_tabController!.addListener(_setActiveTabIndex);
_populateFields();
}
+ Future<dynamic> _getFormDetails() async {
+ _validateUser();
+ _formData = await Provider.of<FormRespository>(context, listen: false)
+ .getFormDetails(widget.application.formId);
+ // print('object');
+ String _errorMessage =
+ Provider.of<FormRespository>(context, listen: false).errorMessage;
+ if (_errorMessage != '') {
+ Helper.toastMessage(_errorMessage);
+ } else {
+ for (int i = 0; i < _formData.fields.length; i++) {
+ if (_formData.fields[i]['fieldType'] != FieldType.heading) {
+ _fieldTypes[_formData.fields[i]['name']] =
+ _formData.fields[i]['fieldType'];
+ }
+ }
+ }
+ // print(_fieldTypes);
+ return _fieldTypes;
+ }
+
void _setActiveTabIndex() {
setState(() {
_activeTabIndex = _tabController!.index;
});
}
- void _populateFields() {
+ void _populateFields() async {
Map updatedFields = {};
- widget.applicationFields.forEach((key, value) => {
+ widget.application.dataObject.forEach((key, value) => {
updatedFields = {},
value.forEach((childKey, childValue) => {
updatedFields[childKey] = {
@@ -91,24 +112,19 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
Future<void> _submitInspection() async {
_validateUser();
- Map data = {'applicationId': widget.applicationId, 'dataObject': _data};
- try {
- final responseCode =
- await Provider.of<ApplicationRespository>(context, listen: false)
- .submitInspection(data);
- if (responseCode == 200) {
- Navigator.of(context).pushReplacement(MaterialPageRoute(
- builder: (context) => InspectionSummaryPage(
- inspectors: widget.applicationInspectors)));
- } else {
- _errorMessage =
- Provider.of<ApplicationRespository>(context, listen: false)
- .errorMessage;
- Helper.toastMessage(_errorMessage);
- }
- } catch (err) {
- throw Exception(err);
- }
+ Map data = {
+ 'applicationId': widget.application.applicationId,
+ 'dataObject': _data
+ };
+
+ Navigator.of(context).pushReplacement(MaterialPageRoute(
+ builder: (context) => InspectionSummaryPage(
+ // formId: widget.formId,
+ formId: 1645422297511,
+ inspectors: widget.application.inspectors,
+ leadInspector: widget.application.leadInspector,
+ inspectionData: data,
+ )));
}
@override
@@ -128,7 +144,7 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
backgroundColor: Colors.white,
leading: const BackButton(color: AppColors.black60),
title: Text(
- widget.applicationTitle,
+ widget.application.title,
style: GoogleFonts.lato(
color: AppColors.black87,
fontSize: 16.0,
@@ -201,24 +217,43 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
),
];
},
- body: Container(
- padding: const EdgeInsets.only(top: 20),
- color: AppColors.scaffoldBackground,
- child:
- TabBarView(controller: _tabController, children: [
- for (Map field in _fields)
- ListView.builder(
- shrinkWrap: true,
- physics: const NeverScrollableScrollPhysics(),
- itemCount: field.length,
- itemBuilder: (context, i) {
- return ApplicationField(
- fieldName: field.keys.elementAt(i),
- fieldData: field[field.keys.elementAt(i)],
- parentAction: updateField,
- );
- })
- ]))))),
+ body: FutureBuilder(
+ future: _getFormDetails(),
+ builder: (context, AsyncSnapshot<dynamic> snapshot) {
+ if (snapshot.hasData && snapshot.data != null) {
+ return Container(
+ padding: const EdgeInsets.only(top: 20),
+ color: AppColors.scaffoldBackground,
+ child: TabBarView(
+ controller: _tabController,
+ children: [
+ for (Map field in _fields)
+ ListView.builder(
+ shrinkWrap: true,
+ physics:
+ const NeverScrollableScrollPhysics(),
+ itemCount: field.length,
+ itemBuilder: (context, i) {
+ return ApplicationField(
+ fieldName:
+ field.keys.elementAt(i),
+ fieldData: field[
+ field.keys.elementAt(i)],
+ fieldType: _fieldTypes[
+ field.keys.elementAt(i)],
+ applicationStatus:
+ widget.application.status,
+ parentAction: updateField,
+ );
+ })
+ ]));
+ } else {
+ return const Center(
+ child: CircularProgressIndicator(),
+ );
+ }
+ },
+ )))),
),
bottomNavigationBar: BottomAppBar(
elevation: 20,
@@ -248,7 +283,7 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
Padding(
padding: const EdgeInsets.only(left: 10),
child: Text(
- 'Previous',
+ AppLocalizations.of(context)!.previous,
style: GoogleFonts.lato(
color: AppColors.primaryBlue,
fontSize: 14.0,
@@ -268,7 +303,7 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
Padding(
padding: const EdgeInsets.only(right: 10),
child: Text(
- 'Next',
+ AppLocalizations.of(context)!.next,
style: GoogleFonts.lato(
color: AppColors.primaryBlue,
fontSize: 14.0,
@@ -282,27 +317,32 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
)
],
))
- : TextButton(
- onPressed: () {
- _submitInspection();
- },
- style: TextButton.styleFrom(
- // primary: Colors.white,
- padding: const EdgeInsets.only(left: 15, right: 15),
- backgroundColor: AppColors.primaryBlue,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(4),
- side: const BorderSide(color: AppColors.black16)),
- ),
- child: Text(
- 'Inspection completed',
- style: GoogleFonts.lato(
- color: Colors.white,
- fontWeight: FontWeight.w700,
- fontSize: 14,
- ),
- ),
- ),
+ : widget.application.status ==
+ InspectionStatus.sentForInspection
+ ? TextButton(
+ onPressed: () {
+ _submitInspection();
+ },
+ style: TextButton.styleFrom(
+ // primary: Colors.white,
+ padding:
+ const EdgeInsets.only(left: 15, right: 15),
+ backgroundColor: AppColors.primaryBlue,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(4),
+ side: const BorderSide(
+ color: AppColors.black16)),
+ ),
+ child: Text(
+ AppLocalizations.of(context)!.inspectionCompleted,
+ style: GoogleFonts.lato(
+ color: Colors.white,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ ),
+ ),
+ )
+ : const Center(),
],
),
)),
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index 40b9626..54262c7 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
import 'package:smf_mobile/constants/app_urls.dart';
@@ -10,6 +9,7 @@ import 'package:smf_mobile/pages/past_applications.dart';
import 'package:smf_mobile/repositories/application_repository.dart';
import 'package:smf_mobile/util/helper.dart';
import 'package:smf_mobile/widgets/application_card.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
// import 'dart:developer' as developer;
@@ -75,6 +75,10 @@ class _HomePageState extends State<HomePage> {
return _allApplications;
}
+ Future<void> _pullRefresh() async {
+ setState(() {});
+ }
+
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -84,7 +88,7 @@ class _HomePageState extends State<HomePage> {
titleSpacing: 20,
backgroundColor: Colors.white,
title: Text(
- 'Pending applications',
+ AppLocalizations.of(context)!.pendingApplications,
style: GoogleFonts.lato(
color: AppColors.black87,
fontSize: 16.0,
@@ -95,8 +99,7 @@ class _HomePageState extends State<HomePage> {
// centerTitle: true,
),
// Tab controller
- body: SingleChildScrollView(
- child: Container(
+ body: Container(
padding: const EdgeInsets.all(20),
decoration: const BoxDecoration(),
constraints: BoxConstraints(
@@ -106,85 +109,92 @@ class _HomePageState extends State<HomePage> {
future: _getApplications(context),
builder: (context, AsyncSnapshot<dynamic> snapshot) {
if (snapshot.hasData && snapshot.data != null) {
- return Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Container(
- width: double.infinity,
- margin: const EdgeInsets.only(top: 10, bottom: 20),
- child: Text('Today',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontSize: 16.0,
- letterSpacing: 0.12,
- fontWeight: FontWeight.w600,
- )),
- ),
- ListView.builder(
- shrinkWrap: true,
- physics: const NeverScrollableScrollPhysics(),
- itemCount: _pendingApplications.length,
- itemBuilder: (context, i) {
- return ApplicationCard(
- application: _pendingApplications[i]);
- },
- ),
- Container(
- width: double.infinity,
- margin: const EdgeInsets.only(top: 20, bottom: 20),
- child: Text('Upcoming',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontSize: 16.0,
- letterSpacing: 0.12,
- fontWeight: FontWeight.w600,
- )),
- ),
- ListView.builder(
- shrinkWrap: true,
- physics: const NeverScrollableScrollPhysics(),
- itemCount: _upcomingApplications.length,
- itemBuilder: (context, i) {
- return ApplicationCard(
- application: _upcomingApplications[i]);
- },
- ),
- Container(
- height: 50,
- width: double.infinity,
- margin: const EdgeInsets.only(top: 20),
- child: ButtonTheme(
- child: OutlinedButton(
- onPressed: () {
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => PastApplications(
- pastApplications: _pastApplications)),
- );
- },
- style: OutlinedButton.styleFrom(
- // primary: Colors.white,
- side: const BorderSide(
- width: 1, color: AppColors.primaryBlue),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(4),
- ),
- // onSurface: Colors.grey,
+ return RefreshIndicator(
+ onRefresh: _pullRefresh,
+ child: ListView(children: [
+ SingleChildScrollView(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ width: double.infinity,
+ margin: const EdgeInsets.only(top: 10, bottom: 20),
+ child: Text(AppLocalizations.of(context)!.today,
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontSize: 16.0,
+ letterSpacing: 0.12,
+ fontWeight: FontWeight.w600,
+ )),
),
- child: Text(
- 'View past applications',
- style: GoogleFonts.lato(
- color: AppColors.primaryBlue,
- fontSize: 14,
- fontWeight: FontWeight.w700),
+ ListView.builder(
+ shrinkWrap: true,
+ physics: const NeverScrollableScrollPhysics(),
+ itemCount: _pendingApplications.length,
+ itemBuilder: (context, i) {
+ return ApplicationCard(
+ application: _pendingApplications[i]);
+ },
),
- ),
- ),
- )
- ],
- );
+ Container(
+ width: double.infinity,
+ margin: const EdgeInsets.only(top: 20, bottom: 20),
+ child: Text(AppLocalizations.of(context)!.upcoming,
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontSize: 16.0,
+ letterSpacing: 0.12,
+ fontWeight: FontWeight.w600,
+ )),
+ ),
+ ListView.builder(
+ shrinkWrap: true,
+ physics: const NeverScrollableScrollPhysics(),
+ itemCount: _upcomingApplications.length,
+ itemBuilder: (context, i) {
+ return ApplicationCard(
+ application: _upcomingApplications[i]);
+ },
+ ),
+ Container(
+ height: 50,
+ width: double.infinity,
+ margin: const EdgeInsets.only(top: 20),
+ child: ButtonTheme(
+ child: OutlinedButton(
+ onPressed: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => PastApplications(
+ pastApplications:
+ _pastApplications)),
+ );
+ },
+ style: OutlinedButton.styleFrom(
+ // primary: Colors.white,
+ side: const BorderSide(
+ width: 1, color: AppColors.primaryBlue),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(4),
+ ),
+ // onSurface: Colors.grey,
+ ),
+ child: Text(
+ AppLocalizations.of(context)!
+ .viewPastApplications,
+ style: GoogleFonts.lato(
+ color: AppColors.primaryBlue,
+ fontSize: 14,
+ fontWeight: FontWeight.w700),
+ ),
+ ),
+ ),
+ )
+ ],
+ ))
+ ]));
} else {
return const Center(
child: CircularProgressIndicator(),
@@ -192,6 +202,6 @@ class _HomePageState extends State<HomePage> {
}
},
),
- )));
+ ));
}
}
diff --git a/lib/pages/inspection_summary.dart b/lib/pages/inspection_summary.dart
index 36f8f68..e529200 100644
--- a/lib/pages/inspection_summary.dart
+++ b/lib/pages/inspection_summary.dart
@@ -1,47 +1,126 @@
import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
import 'package:google_fonts/google_fonts.dart';
+import 'package:provider/provider.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
import 'package:smf_mobile/constants/app_urls.dart';
import 'package:smf_mobile/constants/color_constants.dart';
+import 'package:smf_mobile/models/form_model.dart';
+import 'package:smf_mobile/pages/login_email_page.dart';
+import 'package:smf_mobile/repositories/application_repository.dart';
+import 'package:smf_mobile/repositories/form_repository.dart';
import 'package:smf_mobile/util/helper.dart';
+import 'package:smf_mobile/widgets/people_card.dart';
import 'inspection_completed.dart';
class InspectionSummaryPage extends StatefulWidget {
static const route = AppUrl.inspectionSummary;
+ final int formId;
final List inspectors;
+ final List leadInspector;
+ final Map inspectionData;
- const InspectionSummaryPage({Key? key, required this.inspectors})
+ const InspectionSummaryPage(
+ {Key? key,
+ required this.formId,
+ required this.inspectors,
+ required this.leadInspector,
+ required this.inspectionData})
: super(key: key);
@override
_InspectionSummaryPageState createState() => _InspectionSummaryPageState();
}
class _InspectionSummaryPageState extends State<InspectionSummaryPage> {
- // final List<String> _dropdownItems = [
- // 'Select from the list',
- // 'Somorjit Phuritshabam',
- // 'Shoaib Muhammed'
- // ];
+ final TextEditingController _summaryController = TextEditingController();
final List<Map> _inspectors = [];
-
+ int _leadInspectorId = 0;
bool _iAgree = false;
+ late FormData _formData;
+ String _errorMessage = '';
+ late Map _summaryField;
+ late Map _termsField;
@override
void initState() {
super.initState();
- _populateInspectors();
+ _populateApplicationInspectors();
}
- Future<void> _populateInspectors() async {
- String userId = await Helper.getUser('id');
+ Future<void> _populateApplicationInspectors() async {
+ if (widget.leadInspector.isNotEmpty) {
+ _leadInspectorId = widget.leadInspector[0];
+ }
+ _inspectors.clear();
for (var i = 0; i < widget.inspectors.length; i++) {
- if (userId != widget.inspectors[i]['id']) {
- _inspectors.add({
- 'name':
- '${widget.inspectors[i]['firstName']} ${widget.inspectors[i]['lastName']}',
- 'designation': 'Inspector',
- 'isChecked': false
- });
+ _inspectors.add({
+ 'id': widget.inspectors[i]['id'],
+ 'name':
+ '${widget.inspectors[i]['firstName']} ${widget.inspectors[i]['lastName']}',
+ });
+ setState(() {});
+ }
+ }
+
+ void _validateUser() async {
+ bool tokenExpired = await Helper.isTokenExpired();
+ if (tokenExpired) {
+ Helper.toastMessage('Your session has expired.');
+ Navigator.of(context).pushReplacement(MaterialPageRoute(
+ builder: (context) => const LoginEmailPage(),
+ ));
+ }
+ }
+
+ Future<dynamic> _getFormDetails(context) async {
+ _validateUser();
+ _formData = await Provider.of<FormRespository>(context, listen: false)
+ .getFormDetails(widget.formId);
+ // print('object');
+ String _errorMessage =
+ Provider.of<FormRespository>(context, listen: false).errorMessage;
+ if (_errorMessage != '') {
+ Helper.toastMessage(_errorMessage);
+ } else {
+ for (int i = 0; i < _formData.inspectionFields.length; i++) {
+ if (_formData.inspectionFields[i]['fieldType'] == FieldType.heading) {
+ _summaryField = _formData.inspectionFields[i];
+ } else if (_formData.inspectionFields[i]['fieldType'] ==
+ FieldType.checkbox) {
+ _termsField = _formData.inspectionFields[i];
+ }
+ }
+ }
+ return _formData;
+ }
+
+ Future<void> _submitInspection() async {
+ _validateUser();
+ if (!_iAgree) {
+ Helper.toastMessage('Please accept terms and conditions');
+ return;
+ }
+ try {
+ Map data = widget.inspectionData;
+ data['inspectorSummaryDataObject'] = {
+ 'Inspection Summary': {
+ 'Enter the summary of this inspection': _summaryController.text
+ }
+ };
+ final responseCode =
+ await Provider.of<ApplicationRespository>(context, listen: false)
+ .submitInspection(data);
+ if (responseCode != 0) {
+ Navigator.of(context).pushReplacement(MaterialPageRoute(
+ builder: (context) => const InspectionCompletedPage()));
+ } else {
+ _errorMessage =
+ Provider.of<ApplicationRespository>(context, listen: false)
+ .errorMessage;
+ Helper.toastMessage(_errorMessage);
}
+ } catch (err) {
+ throw Exception(err);
}
}
@@ -68,7 +147,8 @@ class _InspectionSummaryPageState extends State<InspectionSummaryPage> {
body: SingleChildScrollView(
child: Column(children: [
Container(
- // height: MediaQuery.of(context).size.height,
+ constraints: BoxConstraints(
+ minHeight: MediaQuery.of(context).size.height - 200),
margin: const EdgeInsets.all(20),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
@@ -80,250 +160,137 @@ class _InspectionSummaryPageState extends State<InspectionSummaryPage> {
blurRadius: 2)
],
),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Container(
- margin: const EdgeInsets.fromLTRB(20, 30, 20, 15),
- child: Text(
- 'Enter summary of this inspection',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontWeight: FontWeight.w700,
- fontSize: 14,
- letterSpacing: 0.25,
- ),
- )),
- Container(
- margin: const EdgeInsets.fromLTRB(20, 0, 20, 20),
- padding: const EdgeInsets.all(5),
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(4),
- border: Border.all(color: AppColors.black16),
- ),
- child: TextFormField(
- // autofocus: true,
- // focusNode: _notesFocus,
- textCapitalization: TextCapitalization.sentences,
- textInputAction: TextInputAction.done,
- keyboardType: TextInputType.multiline,
- minLines: 10, //Normal textInputField will be displayed
- maxLines: 15, // wh
- // controller: notesController,
- style:
- const TextStyle(color: AppColors.black87, fontSize: 14),
- decoration: const InputDecoration(
- border: InputBorder.none,
- hintText: 'Type here',
- hintStyle:
- TextStyle(fontSize: 14.0, color: AppColors.black60),
- contentPadding: EdgeInsets.all(10.0),
- ),
- ),
- ),
- Container(
- margin: const EdgeInsets.fromLTRB(20, 10, 20, 15),
- child: Text(
- 'People accopanied you',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontWeight: FontWeight.w700,
- fontSize: 14,
- letterSpacing: 0.25,
- ),
- )),
- // Container(
- // margin: const EdgeInsets.fromLTRB(20, 0, 20, 20),
- // child: Row(children: [
- // Container(
- // padding: const EdgeInsets.only(right: 10),
- // decoration: BoxDecoration(
- // color: Colors.white,
- // borderRadius: BorderRadius.circular(4),
- // border: Border.all(color: AppColors.black16),
- // ),
- // child: DropdownButton<String>(
- // value: _selectedItem,
- // icon: const Icon(
- // Icons.arrow_drop_down_outlined,
- // color: AppColors.black60,
- // ),
- // iconSize: 20,
- // elevation: 16,
- // style: const TextStyle(
- // color: AppColors.black60, fontSize: 12),
- // underline: Container(),
- // selectedItemBuilder: (BuildContext context) {
- // return _dropdownItems.map<Widget>((String item) {
- // return Row(
- // children: [
- // Padding(
- // padding: const EdgeInsets.fromLTRB(
- // 20.0, 0.0, 20, 0.0),
- // child: Text(
- // item,
- // style: GoogleFonts.lato(
- // color: AppColors.black60,
- // fontSize: 12,
- // fontWeight: FontWeight.w400,
- // ),
- // ))
- // ],
- // );
- // }).toList();
- // },
- // onChanged: (newValue) {
- // setState(() {
- // _selectedItem = newValue.toString();
- // });
- // },
- // items: _dropdownItems
- // .map<DropdownMenuItem<String>>((String value) {
- // return DropdownMenuItem<String>(
- // value: value,
- // child: Text(value),
- // );
- // }).toList(),
- // )),
- // const Spacer(),
- // ButtonTheme(
- // child: OutlinedButton(
- // onPressed: () {
- // // Navigator.of(context).pop(false);
- // },
- // style: OutlinedButton.styleFrom(
- // // primary: Colors.white,
- // padding: const EdgeInsets.fromLTRB(30, 15, 30, 15),
- // side: const BorderSide(
- // width: 1, color: AppColors.primaryBlue),
- // shape: RoundedRectangleBorder(
- // borderRadius: BorderRadius.circular(4),
- // ),
- // // onSurface: Colors.grey,
- // ),
- // child: Text(
- // 'Add',
- // style: GoogleFonts.lato(
- // color: AppColors.primaryBlue,
- // fontSize: 14,
- // fontWeight: FontWeight.w700),
- // ),
- // ),
- // ),
- // ])),
- for (int i = 0; i < _inspectors.length; i++)
- Container(
- color: Colors.white,
- // width: double.infinity,
- margin: const EdgeInsets.only(
- left: 20, right: 20, bottom: 10.0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Container(
- width: MediaQuery.of(context).size.width - 80,
- decoration: BoxDecoration(
- color: AppColors.black08,
- borderRadius: BorderRadius.circular(4),
- // border: Border.all(color: AppColors.black08),
+ child: FutureBuilder(
+ future: _getFormDetails(context),
+ builder: (context, AsyncSnapshot<dynamic> snapshot) {
+ if (snapshot.hasData && snapshot.data != null) {
+ return Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ margin: const EdgeInsets.fromLTRB(20, 30, 20, 15),
+ child: Text(
+ _summaryField['values'][0]['heading'] ?? '',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ letterSpacing: 0.25,
+ ),
+ )),
+ Container(
+ margin: const EdgeInsets.fromLTRB(20, 0, 20, 20),
+ padding: const EdgeInsets.all(5),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(4),
+ border: Border.all(color: AppColors.black16),
+ ),
+ child: TextFormField(
+ textCapitalization: TextCapitalization.sentences,
+ textInputAction: TextInputAction.done,
+ keyboardType: TextInputType.multiline,
+ minLines: 10,
+ maxLines: 15,
+ controller: _summaryController,
+ style: const TextStyle(
+ color: AppColors.black87, fontSize: 14),
+ decoration: const InputDecoration(
+ border: InputBorder.none,
+ hintText: 'Type here',
+ hintStyle: TextStyle(
+ fontSize: 14.0, color: AppColors.black60),
+ contentPadding: EdgeInsets.all(10.0),
),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- children: [
- Padding(
- padding: const EdgeInsets.all(15.0),
- child: Container(
- height: 48,
- width: 48,
- decoration: const BoxDecoration(
- color: AppColors.primaryGreen,
- borderRadius:
- BorderRadius.all(Radius.circular(4.0)),
- ),
- child: Center(
- child: Text(
- Helper.getInitials(
- _inspectors[i]['name']),
- style: GoogleFonts.lato(
- color: Colors.white)),
- ),
+ ),
+ ),
+ _leadInspectorId != 0
+ ? Container(
+ margin: const EdgeInsets.fromLTRB(20, 10, 20, 15),
+ child: Text(
+ 'Lead inspector',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ letterSpacing: 0.25,
),
- ),
- Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- Column(
- crossAxisAlignment:
- CrossAxisAlignment.start,
- children: [
- Text(
- '${_inspectors[i]['name']}',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontSize: 14.0,
- fontWeight: FontWeight.w700),
- ),
- Padding(
- padding:
- const EdgeInsets.only(top: 10.0),
- child: Text(
- '${_inspectors[i]['designation']}',
- style: GoogleFonts.lato(
- color: AppColors.black60,
- fontSize: 14.0,
- fontWeight: FontWeight.w400),
- ),
- ),
- ],
- ),
- ],
- ),
- const Spacer(),
- Checkbox(
- value: _inspectors[i]['isChecked'],
- activeColor: AppColors.primaryBlue,
- onChanged: (newValue) {
- setState(() {
- _inspectors[i]['isChecked'] = newValue!;
- });
- }),
- ],
+ ))
+ : const Center(),
+ for (int i = 0; i < _inspectors.length; i++)
+ if (_leadInspectorId == _inspectors[i]['id'])
+ PeopleCard(
+ inspector: _inspectors[i],
),
- ),
- ],
- ),
- ),
- const Divider(),
- Container(
- padding: const EdgeInsets.only(left: 10, bottom: 20),
- child: Row(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: <Widget>[
- Checkbox(
- value: _iAgree,
- activeColor: AppColors.primaryBlue,
- onChanged: (newValue) {
- setState(() {
- _iAgree = newValue!;
- });
- }),
Container(
- padding: const EdgeInsets.only(top: 10),
- width: MediaQuery.of(context).size.width - 120,
+ margin: const EdgeInsets.fromLTRB(20, 10, 20, 15),
child: Text(
- 'Sunt autem vel illum, qui dolorem aspernari ut calere ignem, nivem esse albam, dulce mel quorum nihil ut ita ruant itaque earum rerum necessitatibus saepe eveniet, ut labore et aperta iudicari ea commodi consequatur? quis autem vel eum iure reprehenderit, qui in liberos atque corrupti.',
+ 'Assisting inspectors',
style: GoogleFonts.lato(
color: AppColors.black87,
- fontSize: 12.0,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
letterSpacing: 0.25,
- fontWeight: FontWeight.w400,
),
- ))
+ )),
+ for (int i = 0; i < _inspectors.length; i++)
+ if (_leadInspectorId != _inspectors[i]['id'])
+ PeopleCard(
+ inspector: _inspectors[i],
+ ),
+ const Divider(),
+ Container(
+ margin: const EdgeInsets.fromLTRB(20, 10, 20, 0),
+ child: Text(
+ 'Terms and conditions',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ letterSpacing: 0.25,
+ ),
+ )),
+ Container(
+ padding: const EdgeInsets.only(left: 10, bottom: 20),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: <Widget>[
+ Checkbox(
+ value: _iAgree,
+ activeColor: AppColors.primaryBlue,
+ onChanged: (newValue) {
+ setState(() {
+ _iAgree = newValue!;
+ });
+ }),
+ Container(
+ padding: const EdgeInsets.only(top: 10),
+ width: MediaQuery.of(context).size.width - 120,
+ child: Text(
+ _termsField['values'][0]
+ ['additionalProperties'][
+ _termsField['values'][0]
+ ['additionalProperties']
+ .keys
+ .elementAt(0)],
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontSize: 12.0,
+ letterSpacing: 0.25,
+ fontWeight: FontWeight.w400,
+ ),
+ ))
+ ],
+ ),
+ ),
],
- ),
- ),
- ],
+ );
+ } else {
+ return const Center(
+ child: CircularProgressIndicator(),
+ );
+ }
+ },
),
),
Container(
@@ -332,8 +299,7 @@ class _InspectionSummaryPageState extends State<InspectionSummaryPage> {
alignment: Alignment.bottomRight,
child: TextButton(
onPressed: () {
- Navigator.of(context).pushReplacement(MaterialPageRoute(
- builder: (context) => const InspectionCompletedPage()));
+ _submitInspection();
},
style: TextButton.styleFrom(
// primary: Colors.white,
diff --git a/lib/pages/login_email_page.dart b/lib/pages/login_email_page.dart
index 1a5b6c1..629962d 100644
--- a/lib/pages/login_email_page.dart
+++ b/lib/pages/login_email_page.dart
@@ -6,8 +6,8 @@ import 'package:smf_mobile/constants/color_constants.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:smf_mobile/pages/login_otp_page.dart';
import 'package:smf_mobile/repositories/login_repository.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:smf_mobile/util/helper.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class LoginEmailPage extends StatefulWidget {
static const route = AppUrl.loginEmailPage;
@@ -22,11 +22,19 @@ class _LoginEmailPageState extends State<LoginEmailPage> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
String _errorMessage = '';
+ late Locale locale;
+
@override
void initState() {
super.initState();
}
+ // This method should be triggered on some event
+ // _setLang() async {
+ // locale = const Locale('es', '');
+ // LandingPage.of(context)?.setLocale(locale);
+ // }
+
Future<void> _generateOtp() async {
final email = _emailController.text;
if (email == '') {
@@ -100,7 +108,7 @@ class _LoginEmailPageState extends State<LoginEmailPage> {
child: Align(
alignment: Alignment.center,
child: Text(
- 'Login',
+ AppLocalizations.of(context)!.login,
textAlign: TextAlign.center,
style: GoogleFonts.lato(
color: AppColors.black87,
@@ -115,7 +123,7 @@ class _LoginEmailPageState extends State<LoginEmailPage> {
top: 50,
),
child: Text(
- 'Email Id',
+ AppLocalizations.of(context)!.emailId,
textAlign: TextAlign.left,
style: GoogleFonts.lato(
color: AppColors.black87,
@@ -215,7 +223,8 @@ class _LoginEmailPageState extends State<LoginEmailPage> {
Align(
alignment: Alignment.center,
child: Text(
- 'GET OTP',
+ AppLocalizations.of(context)!
+ .getOtp,
textAlign: TextAlign.center,
style: GoogleFonts.lato(
color: Colors.white,
diff --git a/lib/pages/login_otp_page.dart b/lib/pages/login_otp_page.dart
index d7f4b9b..3bb11ae 100644
--- a/lib/pages/login_otp_page.dart
+++ b/lib/pages/login_otp_page.dart
@@ -8,8 +8,8 @@ import 'package:smf_mobile/pages/login_email_page.dart';
import 'package:otp_text_field/otp_field.dart';
import 'package:otp_text_field/style.dart';
import 'package:smf_mobile/repositories/login_repository.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:smf_mobile/util/helper.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class LoginOtpPage extends StatefulWidget {
static const route = AppUrl.loginOtpPage;
@@ -97,7 +97,7 @@ class _LoginOtpPageState extends State<LoginOtpPage> {
child: Align(
alignment: Alignment.center,
child: Text(
- 'Login',
+ AppLocalizations.of(context)!.login,
textAlign: TextAlign.center,
style: GoogleFonts.lato(
color: AppColors.black87,
@@ -112,7 +112,7 @@ class _LoginOtpPageState extends State<LoginOtpPage> {
top: 50,
),
child: Text(
- 'Enter OTP',
+ AppLocalizations.of(context)!.enterOtp,
textAlign: TextAlign.left,
style: GoogleFonts.lato(
color: AppColors.black87,
@@ -165,7 +165,7 @@ class _LoginOtpPageState extends State<LoginOtpPage> {
Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
child: Text(
- 'Enter the 6 digit OTP sent to your email address.',
+ AppLocalizations.of(context)!.otpFieldDescription,
style: GoogleFonts.lato(
color: AppColors.black60,
fontSize: 12,
@@ -201,7 +201,8 @@ class _LoginOtpPageState extends State<LoginOtpPage> {
Align(
alignment: Alignment.center,
child: Text(
- 'SIGN IN',
+ AppLocalizations.of(context)!
+ .signIn,
textAlign: TextAlign.center,
style: GoogleFonts.lato(
color: Colors.white,
@@ -224,7 +225,7 @@ class _LoginOtpPageState extends State<LoginOtpPage> {
padding: const EdgeInsets.fromLTRB(0, 10, 0, 10),
width: double.infinity,
child: Text(
- 'Go back, re-enter the email',
+ AppLocalizations.of(context)!.goBackText,
textAlign: TextAlign.center,
style: GoogleFonts.lato(
color: AppColors.primaryBlue,
diff --git a/lib/pages/past_applications.dart b/lib/pages/past_applications.dart
index d4e04cf..f902723 100644
--- a/lib/pages/past_applications.dart
+++ b/lib/pages/past_applications.dart
@@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:smf_mobile/constants/color_constants.dart';
import 'package:smf_mobile/models/application_model.dart';
import 'package:smf_mobile/widgets/application_card.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class PastApplications extends StatefulWidget {
final List<Application> pastApplications;
@@ -27,7 +28,7 @@ class _PastApplicationsState extends State<PastApplications> {
backgroundColor: Colors.white,
leading: const BackButton(color: AppColors.black60),
title: Text(
- 'Past applications',
+ AppLocalizations.of(context)!.pastApplications,
style: GoogleFonts.lato(
color: AppColors.black87,
fontSize: 16.0,
diff --git a/lib/repositories/application_repository.dart b/lib/repositories/application_repository.dart
index 008bc11..3dbe036 100644
--- a/lib/repositories/application_repository.dart
+++ b/lib/repositories/application_repository.dart
@@ -30,7 +30,6 @@ class ApplicationRespository with ChangeNotifier {
try {
final request = await ApplicationService.submitInspection(data);
_data = json.decode(request.body);
- print(_data);
} catch (_) {
return _;
}
diff --git a/lib/repositories/form_repository.dart b/lib/repositories/form_repository.dart
new file mode 100644
index 0000000..9e469fa
--- /dev/null
+++ b/lib/repositories/form_repository.dart
@@ -0,0 +1,28 @@
+import 'dart:convert';
+import 'package:flutter/widgets.dart';
+import 'package:smf_mobile/services/form_service.dart';
+import 'package:smf_mobile/models/form_model.dart';
+// import 'dart:developer' as developer;
+
+class FormRespository with ChangeNotifier {
+ late Map _data;
+ late FormData _formData;
+ String _errorMessage = '';
+
+ Future<dynamic> getFormDetails(int formId) async {
+ try {
+ final request = await FormService.getFormDetails(formId);
+ _data = json.decode(request.body);
+ } catch (_) {
+ return _;
+ }
+ if (_data['statusInfo']['statusCode'] != 200) {
+ _errorMessage = _data['statusInfo']['errorMessage'];
+ } else {
+ _formData = FormData.fromJson(_data['responseData']);
+ }
+ return _formData;
+ }
+
+ String get errorMessage => _errorMessage;
+}
diff --git a/lib/repositories/user_repository.dart b/lib/repositories/user_repository.dart
new file mode 100644
index 0000000..e45fdf8
--- /dev/null
+++ b/lib/repositories/user_repository.dart
@@ -0,0 +1,31 @@
+import 'dart:convert';
+import 'package:flutter/widgets.dart';
+// import 'package:smf_mobile/models/application_model.dart';
+import 'package:smf_mobile/services/user_service.dart';
+
+class UserRespository with ChangeNotifier {
+ late Map _data;
+ // List<Application> _applications = [];
+ String _errorMessage = '';
+
+ Future<dynamic> getAllUsers() async {
+ try {
+ final request = await UserService.getAllUsers();
+ _data = json.decode(request.body);
+ } catch (_) {
+ return _;
+ }
+
+ if (_data['statusInfo']['statusCode'] != 200) {
+ _errorMessage = _data['statusInfo']['errorMessage'];
+ } else {
+ // _applications = [
+ // for (final item in _data['responseData']) Application.fromJson(item)
+ // ];
+ }
+ // return _applications;
+ return _data;
+ }
+
+ String get errorMessage => _errorMessage;
+}
diff --git a/lib/services/application_service.dart b/lib/services/application_service.dart
index c8fcc22..56158e5 100644
--- a/lib/services/application_service.dart
+++ b/lib/services/application_service.dart
@@ -2,17 +2,17 @@ import 'dart:convert';
import 'dart:io';
import 'package:http/http.dart' as http;
import 'package:smf_mobile/constants/api_endpoints.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
import 'package:smf_mobile/services/base_service.dart';
-import 'package:smf_mobile/util/helper.dart';
-import 'dart:developer' as developer;
+// import 'dart:developer' as developer;
class ApplicationService extends BaseService {
ApplicationService(HttpClient client) : super(client);
static Future<dynamic> getApplications() async {
- Map requestData = {'searchObjects': []};
+ Map requestData = {'status': InspectionStatus.sentForInspection};
var body = json.encode(requestData);
- Map<String, String> headers = await Helper.getHeaders();
+ Map<String, String> headers = await BaseService.getHeaders();
final response = await http.post(Uri.parse(ApiUrl.getAllApplications),
headers: headers, body: body);
@@ -22,10 +22,13 @@ class ApplicationService extends BaseService {
static Future<dynamic> submitInspection(Map data) async {
var body = json.encode(data);
- Map<String, String> headers = await Helper.getHeaders();
- // developer.log(ApiUrl.submitInspection);
+ Map<String, String> headers = await BaseService.getHeaders();
+
final response = await http.post(Uri.parse(ApiUrl.submitInspection),
headers: headers, body: body);
+ // developer.log(ApiUrl.submitInspection);
+ // developer.log(body);
+ // developer.log(response.body);
return response;
}
}
diff --git a/lib/services/base_service.dart b/lib/services/base_service.dart
index c476c4e..fb56f8e 100644
--- a/lib/services/base_service.dart
+++ b/lib/services/base_service.dart
@@ -1,6 +1,21 @@
import 'dart:io';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+const _storage = FlutterSecureStorage();
abstract class BaseService {
final HttpClient client;
const BaseService(this.client);
+
+ static Future<Map<String, String>> getHeaders() async {
+ Map<String, String> headers = {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json; charset=utf-8',
+ };
+ var authToken = await _storage.read(key: 'authToken');
+ if (authToken != '' && authToken != null) {
+ headers['Authorization'] = authToken;
+ }
+ return headers;
+ }
}
diff --git a/lib/services/form_service.dart b/lib/services/form_service.dart
new file mode 100644
index 0000000..7e1fc27
--- /dev/null
+++ b/lib/services/form_service.dart
@@ -0,0 +1,21 @@
+import 'dart:io';
+import 'package:http/http.dart' as http;
+import 'package:smf_mobile/constants/api_endpoints.dart';
+import 'package:smf_mobile/services/base_service.dart';
+// import 'dart:developer' as developer;
+
+class FormService extends BaseService {
+ FormService(HttpClient client) : super(client);
+
+ static Future<dynamic> getFormDetails(int formId) async {
+ Map<String, String> headers = await BaseService.getHeaders();
+
+ final response = await http.get(
+ Uri.parse(ApiUrl.getFormDetails + formId.toString()),
+ headers: headers);
+ // developer.log(ApiUrl.getAllUsers);
+ // developer.log(headers.toString());
+ // developer.log(response.body);
+ return response;
+ }
+}
diff --git a/lib/services/login_service.dart b/lib/services/login_service.dart
index 687d670..e9efcae 100644
--- a/lib/services/login_service.dart
+++ b/lib/services/login_service.dart
@@ -3,7 +3,6 @@ import 'dart:io';
import 'package:http/http.dart' as http;
import 'package:smf_mobile/constants/api_endpoints.dart';
import 'package:smf_mobile/services/base_service.dart';
-import 'package:smf_mobile/util/helper.dart';
// import 'dart:developer' as developer;
class LoginService extends BaseService {
@@ -14,7 +13,7 @@ class LoginService extends BaseService {
'username': username,
};
var body = json.encode(requestData);
- Map<String, String> headers = await Helper.getHeaders();
+ Map<String, String> headers = await BaseService.getHeaders();
final response =
await http.post(Uri.parse(ApiUrl.getOtp), headers: headers, body: body);
return response;
@@ -23,7 +22,7 @@ class LoginService extends BaseService {
static Future<dynamic> validateOtp(String username, String otp) async {
Map requestData = {'username': username, 'otp': otp};
var body = json.encode(requestData);
- Map<String, String> headers = await Helper.getHeaders();
+ Map<String, String> headers = await BaseService.getHeaders();
final response = await http.post(Uri.parse(ApiUrl.validateOtp),
headers: headers, body: body);
return response;
diff --git a/lib/services/user_service.dart b/lib/services/user_service.dart
new file mode 100644
index 0000000..1c2a3dd
--- /dev/null
+++ b/lib/services/user_service.dart
@@ -0,0 +1,27 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:http/http.dart' as http;
+import 'package:smf_mobile/constants/api_endpoints.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
+import 'package:smf_mobile/services/base_service.dart';
+// import 'dart:developer' as developer;
+
+class UserService extends BaseService {
+ UserService(HttpClient client) : super(client);
+
+ static Future<dynamic> getAllUsers() async {
+ Map requestData = {
+ "active": true,
+ "roleId": [inspectorRoleId]
+ };
+ var body = json.encode(requestData);
+ Map<String, String> headers = await BaseService.getHeaders();
+ final response = await http.post(Uri.parse(ApiUrl.getAllUsers),
+ headers: headers, body: body);
+ // developer.log(ApiUrl.getAllUsers);
+ // developer.log(headers.toString());
+ // developer.log(body);
+ // developer.log(response.body);
+ return response;
+ }
+}
diff --git a/lib/util/helper.dart b/lib/util/helper.dart
index b7f08c6..0582bd1 100644
--- a/lib/util/helper.dart
+++ b/lib/util/helper.dart
@@ -37,18 +37,6 @@ class Helper {
return isTokenExpired;
}
- static Future<Map<String, String>> getHeaders() async {
- Map<String, String> headers = {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json; charset=utf-8',
- };
- var authToken = await _storage.read(key: 'authToken');
- if (authToken != '' && authToken != null) {
- headers['Authorization'] = authToken;
- }
- return headers;
- }
-
static toastMessage(String message) {
Fluttertoast.showToast(
msg: message,
diff --git a/lib/widgets/application_card.dart b/lib/widgets/application_card.dart
index 33fcee6..72a8c5c 100644
--- a/lib/widgets/application_card.dart
+++ b/lib/widgets/application_card.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
import 'package:smf_mobile/constants/app_urls.dart';
import 'package:smf_mobile/constants/color_constants.dart';
import 'package:smf_mobile/models/application_model.dart';
@@ -28,10 +29,7 @@ class _ApplicationCardState extends State<ApplicationCard> {
context,
MaterialPageRoute(
builder: (context) => ApplicationDetailsPage(
- applicationId: widget.application.applicationId,
- applicationTitle: widget.application.title,
- applicationFields: widget.application.dataObject,
- applicationInspectors: widget.application.inspectors,
+ application: widget.application,
)),
),
child: Container(
@@ -78,6 +76,42 @@ class _ApplicationCardState extends State<ApplicationCard> {
letterSpacing: 0.12,
fontWeight: FontWeight.w400,
)),
+ ),
+ Row(
+ children: [
+ Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: Text('Status: ',
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontSize: 14.0,
+ letterSpacing: 0.12,
+ fontWeight: FontWeight.w400,
+ )),
+ ),
+ widget.application.status ==
+ InspectionStatus.inspectionCompleted
+ ? Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: Text('Completed',
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontSize: 14.0,
+ letterSpacing: 0.12,
+ fontWeight: FontWeight.w700,
+ )),
+ )
+ : Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: Text('Pending',
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontSize: 14.0,
+ letterSpacing: 0.12,
+ fontWeight: FontWeight.w700,
+ )),
+ )
+ ],
)
],
),
diff --git a/lib/widgets/application_field.dart b/lib/widgets/application_field.dart
index cfacc73..da777e1 100644
--- a/lib/widgets/application_field.dart
+++ b/lib/widgets/application_field.dart
@@ -1,16 +1,21 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
import 'package:smf_mobile/constants/color_constants.dart';
-// import './../../constants.dart';
+import 'package:smf_mobile/widgets/application_field_dialog.dart';
class ApplicationField extends StatefulWidget {
final String fieldName;
final Map fieldData;
+ final String fieldType;
+ final String applicationStatus;
final ValueChanged<Map> parentAction;
const ApplicationField({
Key? key,
required this.fieldName,
required this.fieldData,
+ required this.fieldType,
+ required this.applicationStatus,
required this.parentAction,
}) : super(key: key);
@override
@@ -20,27 +25,34 @@ class ApplicationField extends StatefulWidget {
class _ApplicationFieldState extends State<ApplicationField> {
late Map _data;
late String _radioValue;
+ String _inspectionValue = '';
+ String _summaryText = '';
final List<String> _options = ['Correct', 'Incorrect'];
- final TextEditingController _noteController = TextEditingController();
@override
void initState() {
super.initState();
+ // print(widget.fieldName + ', ' + widget.fieldType);
_data = widget.fieldData[widget.fieldData.keys.elementAt(0)];
_radioValue = _data[_data.keys.elementAt(0)];
- _noteController.text = _data[_data.keys.elementAt(1)];
+ _summaryText = _data[_data.keys.elementAt(1)];
}
- _triggerUpdate() {
+ triggerUpdate(Map dialogData) {
Map data = {
widget.fieldName: {
widget.fieldData.keys.elementAt(0): {
'value': _radioValue,
- 'comments': _noteController.text
+ 'comments': dialogData['summaryText'],
+ 'inspectionValue': dialogData['inspectionValue']
}
}
};
// print(data);
+ setState(() {
+ _summaryText = dialogData['summaryText'];
+ _inspectionValue = dialogData['inspectionValue'];
+ });
widget.parentAction(data);
}
@@ -48,137 +60,11 @@ class _ApplicationFieldState extends State<ApplicationField> {
return showDialog(
context: context,
builder: (context) => StatefulBuilder(builder: (context, setState) {
- return Stack(
- children: [
- Align(
- alignment: FractionalOffset.topCenter,
- child: Container(
- margin: const EdgeInsets.only(top: 150),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(4)),
- height: 285,
- width: MediaQuery.of(context).size.width - 40,
- child: Material(
- child: Padding(
- padding: const EdgeInsets.all(20),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Padding(
- padding: const EdgeInsets.all(0),
- child: Text(
- 'Enter the reason for the incorrect selection',
- style: GoogleFonts.lato(
- color: AppColors.black87,
- fontWeight: FontWeight.w700,
- fontSize: 14,
- letterSpacing: 0.25,
- ),
- )),
- Container(
- margin: const EdgeInsets.only(top: 15),
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(4),
- border: Border.all(color: AppColors.black16),
- ),
- child: Material(
- color: Colors.white,
- borderRadius: BorderRadius.circular(8),
- child: Focus(
- child: TextFormField(
- autofocus: true,
- controller: _noteController,
- textCapitalization:
- TextCapitalization.sentences,
- textInputAction: TextInputAction.done,
- keyboardType: TextInputType.multiline,
- minLines:
- 8, //Normal textInputField will be displayed
- maxLines: 8, // wh
- // controller: notesController,
- style: const TextStyle(
- color: AppColors.black87,
- fontSize: 14),
- decoration: const InputDecoration(
- border: InputBorder.none,
- hintText: 'Type here',
- hintStyle: TextStyle(
- fontSize: 14.0,
- color: AppColors.black60),
- contentPadding: EdgeInsets.all(10.0),
- ),
- ),
- ),
- ),
- ),
- Container(
- margin: const EdgeInsets.only(top: 15),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- ButtonTheme(
- child: OutlinedButton(
- onPressed: () {
- Navigator.of(context).pop(false);
- },
- style: OutlinedButton.styleFrom(
- // primary: Colors.white,
- side: const BorderSide(
- width: 1,
- color: AppColors.primaryBlue),
- shape: RoundedRectangleBorder(
- borderRadius:
- BorderRadius.circular(4),
- ),
- // onSurface: Colors.grey,
- ),
- child: Text(
- 'Cancel',
- style: GoogleFonts.lato(
- color: AppColors.primaryBlue,
- fontSize: 14,
- fontWeight: FontWeight.w700),
- ),
- ),
- ),
- Padding(
- padding:
- const EdgeInsets.only(left: 10),
- child: TextButton(
- onPressed: () {
- Navigator.of(context).pop(false);
- _triggerUpdate();
- },
- style: TextButton.styleFrom(
- // primary: Colors.white,
- padding: const EdgeInsets.only(
- left: 15, right: 15),
- backgroundColor:
- AppColors.primaryBlue,
- shape: RoundedRectangleBorder(
- borderRadius:
- BorderRadius.circular(4),
- side: const BorderSide(
- color: AppColors.black16)),
- ),
- child: Text(
- 'Submit',
- style: GoogleFonts.lato(
- color: Colors.white,
- fontWeight: FontWeight.w700,
- fontSize: 14,
- ),
- ),
- ),
- )
- ],
- ))
- ],
- ),
- )),
- )),
- ],
+ return ApplicationFieldDialog(
+ summaryText: _summaryText,
+ inspectionValue: _inspectionValue,
+ fieldType: widget.fieldType,
+ parentAction: triggerUpdate,
);
}));
}
@@ -187,7 +73,7 @@ class _ApplicationFieldState extends State<ApplicationField> {
Widget build(BuildContext context) {
// if (_data != widget.fieldData[widget.fieldData.keys.elementAt(0)]) {
// _radioValue = _data[_data.keys.elementAt(0)];
- // _noteController.text = _data[_data.keys.elementAt(1)];
+ // _summaryText = _data[_data.keys.elementAt(1)];
// }
return SingleChildScrollView(
reverse: true,
@@ -289,13 +175,23 @@ class _ApplicationFieldState extends State<ApplicationField> {
for (int i = 0; i < _options.length; i++)
InkWell(
onTap: () {
- setState(() {
- _radioValue = _options[i];
- });
- if (_options[i] == 'Incorrect') {
- _displayCommentDialog();
+ if (widget.applicationStatus ==
+ InspectionStatus
+ .sentForInspection) {
+ setState(() {
+ _radioValue = _options[i];
+ });
+ if (_options[i] ==
+ 'Incorrect') {
+ _displayCommentDialog();
+ }
+ Map data = {
+ 'summaryText': _summaryText,
+ 'inspectionValue':
+ _inspectionValue
+ };
+ triggerUpdate(data);
}
- _triggerUpdate();
},
child: Container(
padding: const EdgeInsets.only(
@@ -327,14 +223,25 @@ class _ApplicationFieldState extends State<ApplicationField> {
MaterialTapTargetSize
.shrinkWrap,
onChanged: (val) {
- setState(() {
- _radioValue =
- _options[i];
- });
- _triggerUpdate();
- if (_options[i] ==
- 'Incorrect') {
- _displayCommentDialog();
+ if (widget
+ .applicationStatus ==
+ InspectionStatus
+ .sentForInspection) {
+ setState(() {
+ _radioValue =
+ _options[i];
+ });
+ Map data = {
+ 'summaryText':
+ _summaryText,
+ 'inspectionValue':
+ _inspectionValue
+ };
+ triggerUpdate(data);
+ if (_options[i] ==
+ 'Incorrect') {
+ _displayCommentDialog();
+ }
}
},
),
@@ -353,17 +260,65 @@ class _ApplicationFieldState extends State<ApplicationField> {
Padding(
padding: const EdgeInsets.only(left: 0),
child: IconButton(
- onPressed: () =>
- _displayCommentDialog(),
- icon: const Icon(
- Icons.message,
- color: AppColors.black40,
- ),
+ onPressed: () {
+ if (widget.applicationStatus ==
+ InspectionStatus
+ .sentForInspection &&
+ _radioValue != 'Correct') {
+ _displayCommentDialog();
+ }
+ },
+ icon: _radioValue != 'Correct'
+ ? const Icon(
+ Icons.edit,
+ color: AppColors.black40,
+ )
+ : const Icon(
+ Icons.message,
+ color: AppColors.black40,
+ ),
),
)
],
)),
- _noteController.text.isNotEmpty
+ _radioValue != 'Correct' && _summaryText != ''
+ ? Container(
+ margin: const EdgeInsets.only(top: 10),
+ padding: const EdgeInsets.fromLTRB(
+ 15, 10, 15, 10),
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: Colors.white,
+ border: Border.all(
+ color: AppColors.black16),
+ borderRadius: BorderRadius.circular(4),
+ ),
+ child: Text(
+ _summaryText,
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontSize: 14.0,
+ letterSpacing: 0.25,
+ fontWeight: FontWeight.w400,
+ ),
+ ),
+ )
+ : const Center(),
+ _radioValue != 'Correct' && _inspectionValue != ''
+ ? Container(
+ width: MediaQuery.of(context).size.width,
+ padding: const EdgeInsets.only(top: 20),
+ child: Text(
+ widget.fieldName,
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontWeight: FontWeight.w700,
+ fontSize: 14.0,
+ letterSpacing: 0.25,
+ ),
+ ))
+ : const Center(),
+ _radioValue != 'Correct' && _inspectionValue != ''
? Container(
margin: const EdgeInsets.only(top: 10),
padding: const EdgeInsets.fromLTRB(
@@ -376,7 +331,7 @@ class _ApplicationFieldState extends State<ApplicationField> {
borderRadius: BorderRadius.circular(4),
),
child: Text(
- _noteController.text,
+ _inspectionValue,
style: GoogleFonts.lato(
color: AppColors.black60,
fontSize: 14.0,
diff --git a/lib/widgets/application_field_dialog.dart b/lib/widgets/application_field_dialog.dart
new file mode 100644
index 0000000..df381b6
--- /dev/null
+++ b/lib/widgets/application_field_dialog.dart
@@ -0,0 +1,206 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
+import 'package:smf_mobile/constants/color_constants.dart';
+import 'package:smf_mobile/widgets/questions/text_question.dart';
+
+class ApplicationFieldDialog extends StatefulWidget {
+ final String summaryText;
+ final String inspectionValue;
+ final String fieldType;
+ final ValueChanged<Map> parentAction;
+ const ApplicationFieldDialog({
+ Key? key,
+ required this.summaryText,
+ required this.inspectionValue,
+ required this.fieldType,
+ required this.parentAction,
+ }) : super(key: key);
+
+ @override
+ _ApplicationFieldDialogState createState() => _ApplicationFieldDialogState();
+}
+
+class _ApplicationFieldDialogState extends State<ApplicationFieldDialog> {
+ final TextEditingController _summaryController = TextEditingController();
+ String _inspectionValue = '';
+ bool inspectionUpdated = false;
+ Map data = {};
+ @override
+ void initState() {
+ super.initState();
+ _summaryController.text = widget.summaryText;
+ }
+
+ saveData(String inspectionValue) {
+ setState(() {
+ _inspectionValue = inspectionValue;
+ });
+ // _submitData();
+ }
+
+ _submitData() {
+ data = {
+ 'summaryText': _summaryController.text,
+ 'inspectionValue': _inspectionValue
+ };
+ widget.parentAction(data);
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Stack(
+ children: [
+ Align(
+ alignment: FractionalOffset.topCenter,
+ child: Container(
+ margin: const EdgeInsets.only(top: 150),
+ decoration: BoxDecoration(
+ color: Colors.white, borderRadius: BorderRadius.circular(4)),
+ constraints: const BoxConstraints(minHeight: 300, maxHeight: 400),
+ width: MediaQuery.of(context).size.width - 40,
+ child: Material(
+ child: Padding(
+ padding: const EdgeInsets.all(20),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ SizedBox(
+ height: 290,
+ child: ListView(
+ shrinkWrap: true,
+ physics: const AlwaysScrollableScrollPhysics(),
+ scrollDirection: Axis.vertical,
+ children: [
+ Padding(
+ padding: const EdgeInsets.all(0),
+ child: Text(
+ 'Enter the reason for the incorrect selection',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ letterSpacing: 0.25,
+ ),
+ )),
+ Container(
+ margin: const EdgeInsets.only(top: 15),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(4),
+ border: Border.all(color: AppColors.black16),
+ ),
+ child: Material(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(8),
+ child: Focus(
+ child: TextFormField(
+ autofocus: true,
+ controller: _summaryController,
+ textCapitalization:
+ TextCapitalization.sentences,
+ textInputAction: TextInputAction.done,
+ keyboardType: TextInputType.multiline,
+ minLines:
+ 8, //Normal textInputField will be displayed
+ maxLines: 8, // wh
+ // controller: notesController,
+ style: const TextStyle(
+ color: AppColors.black87, fontSize: 14),
+ decoration: const InputDecoration(
+ border: InputBorder.none,
+ hintText: 'Type here',
+ hintStyle: TextStyle(
+ fontSize: 14.0,
+ color: AppColors.black60),
+ contentPadding: EdgeInsets.all(10.0),
+ ),
+ ),
+ ),
+ ),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(top: 20),
+ child: Text(
+ 'Actual value(s)',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ letterSpacing: 0.25,
+ ),
+ )),
+ widget.fieldType == FieldType.text ||
+ widget.fieldType == FieldType.numeric ||
+ widget.fieldType == FieldType.email
+ ? TextQuestion(
+ fieldType: widget.fieldType,
+ answerGiven: widget.inspectionValue,
+ parentAction: saveData)
+ : const Center(),
+ ]),
+ ),
+ Container(
+ margin: const EdgeInsets.only(top: 15),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ ButtonTheme(
+ child: OutlinedButton(
+ onPressed: () {
+ Navigator.of(context).pop(false);
+ },
+ style: OutlinedButton.styleFrom(
+ // primary: Colors.white,
+ side: const BorderSide(
+ width: 1, color: AppColors.primaryBlue),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(4),
+ ),
+ // onSurface: Colors.grey,
+ ),
+ child: Text(
+ 'Cancel',
+ style: GoogleFonts.lato(
+ color: AppColors.primaryBlue,
+ fontSize: 14,
+ fontWeight: FontWeight.w700),
+ ),
+ ),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(left: 10),
+ child: TextButton(
+ onPressed: () {
+ Navigator.of(context).pop(false);
+ _submitData();
+ },
+ style: TextButton.styleFrom(
+ // primary: Colors.white,
+ padding: const EdgeInsets.only(
+ left: 15, right: 15),
+ backgroundColor: AppColors.primaryBlue,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(4),
+ side: const BorderSide(
+ color: AppColors.black16)),
+ ),
+ child: Text(
+ 'Submit',
+ style: GoogleFonts.lato(
+ color: Colors.white,
+ fontWeight: FontWeight.w700,
+ fontSize: 14,
+ ),
+ ),
+ ),
+ )
+ ],
+ ))
+ ],
+ ),
+ )),
+ )),
+ ],
+ );
+ }
+}
diff --git a/lib/widgets/people_card.dart b/lib/widgets/people_card.dart
new file mode 100644
index 0000000..63d80a2
--- /dev/null
+++ b/lib/widgets/people_card.dart
@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:smf_mobile/constants/color_constants.dart';
+import 'package:smf_mobile/util/helper.dart';
+
+class PeopleCard extends StatelessWidget {
+ final Map inspector;
+ final bool addedByLead;
+ const PeopleCard(
+ {Key? key, required this.inspector, this.addedByLead = false})
+ : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ color: Colors.white,
+ // width: double.infinity,
+ margin: const EdgeInsets.only(left: 20, right: 20, bottom: 10.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Container(
+ width: MediaQuery.of(context).size.width - 80,
+ decoration: BoxDecoration(
+ color: AppColors.black08,
+ borderRadius: BorderRadius.circular(4),
+ // border: Border.all(color: AppColors.black08),
+ ),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ Padding(
+ padding: const EdgeInsets.all(15.0),
+ child: Container(
+ height: addedByLead ? 48 : 24,
+ width: addedByLead ? 48 : 24,
+ decoration: const BoxDecoration(
+ color: AppColors.primaryGreen,
+ borderRadius: BorderRadius.all(Radius.circular(4.0)),
+ ),
+ child: Center(
+ child: Text(Helper.getInitials(inspector['name']),
+ style: GoogleFonts.lato(color: Colors.white)),
+ ),
+ ),
+ ),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ '${inspector['name']}',
+ style: GoogleFonts.lato(
+ color: AppColors.black87,
+ fontSize: 14.0,
+ fontWeight: FontWeight.w700),
+ ),
+ addedByLead
+ ? Padding(
+ padding: const EdgeInsets.only(top: 10.0),
+ child: Text(
+ '${inspector['designation'] ?? 'Assisting inspector'}',
+ style: GoogleFonts.lato(
+ color: AppColors.black60,
+ fontSize: 14.0,
+ fontWeight: FontWeight.w400),
+ ),
+ )
+ : const Center(),
+ ],
+ ),
+ ],
+ ),
+ // const Spacer(),
+ // Checkbox(
+ // value: _inspectors[i]['isChecked'],
+ // activeColor: AppColors.primaryBlue,
+ // onChanged: (newValue) {
+ // setState(() {
+ // _inspectors[i]['isChecked'] = newValue!;
+ // });
+ // }),
+ ],
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/widgets/questions/multi_select_question.dart b/lib/widgets/questions/multi_select_question.dart
new file mode 100644
index 0000000..30fc692
--- /dev/null
+++ b/lib/widgets/questions/multi_select_question.dart
@@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
+import './../../../../feedback/constants.dart';
+
+class MultiSelectQuestion extends StatefulWidget {
+ final question;
+ final int currentIndex;
+ final answerGiven;
+ final bool showAnswer;
+ final ValueChanged<Map> parentAction;
+ MultiSelectQuestion(this.question, this.currentIndex, this.answerGiven,
+ this.showAnswer, this.parentAction);
+ @override
+ _MultiSelectQuestionQuestionState createState() =>
+ _MultiSelectQuestionQuestionState();
+}
+
+class _MultiSelectQuestionQuestionState extends State<MultiSelectQuestion> {
+ Map<int, bool> isChecked = {
+ 1: false,
+ 2: false,
+ 3: false,
+ 4: false,
+ };
+ List selectedOptions = [];
+ List<int> _correctAnswer = [];
+
+ @override
+ void initState() {
+ super.initState();
+ if (widget.answerGiven != null) {
+ selectedOptions = widget.answerGiven;
+ for (int i = 0; i < widget.question['options'].length; i++) {
+ if (selectedOptions
+ .contains(widget.question['options'][i]['optionId'])) {
+ isChecked[i + 1] = true;
+ }
+ if (widget.question['options'][i]['isCorrect']) {
+ _correctAnswer.add(i);
+ }
+ }
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ height: MediaQuery.of(context).size.height- 30,
+ padding: const EdgeInsets.all(32),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ padding: const EdgeInsets.only(bottom: 15),
+ child: HtmlWidget(
+ widget.question['question'],
+ textStyle: GoogleFonts.lato(
+ color: FeedbackColors.black87,
+ fontWeight: FontWeight.w600,
+ fontSize: 16.0,
+ ),
+ ),
+ ),
+ ListView.builder(
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemCount: widget.question['options'].length,
+ itemBuilder: (context, index) {
+ return Container(
+ width: MediaQuery.of(context).size.width,
+ // padding: const EdgeInsets.all(15),
+ margin: const EdgeInsets.only(top: 10, bottom: 10),
+ decoration: BoxDecoration(
+ color: isChecked[index + 1] &&
+ _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLightBg
+ : isChecked[index + 1] &&
+ !_correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.negativeLightBg
+ : _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLightBg
+ : _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.negativeLightBg
+ : isChecked[index + 1] &&
+ _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLightBg
+ : Colors.white,
+ borderRadius: BorderRadius.all(const Radius.circular(4.0)),
+ border: Border.all(
+ color: isChecked[index + 1] &&
+ _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLight
+ : isChecked[index + 1] &&
+ !_correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.negativeLight
+ : _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLight
+ : _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.negativeLight
+ : isChecked[index + 1] &&
+ _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLight
+ : isChecked[index + 1]
+ ? FeedbackColors.primaryBlue
+ : FeedbackColors.black16,
+ ),
+ ),
+ child: CheckboxListTile(
+ controlAffinity: ListTileControlAffinity.leading,
+ activeColor: _correctAnswer.contains(index) &&
+ widget.showAnswer
+ ? FeedbackColors.positiveLight
+ : !_correctAnswer.contains(index) && widget.showAnswer
+ ? FeedbackColors.negativeLight
+ : FeedbackColors.primaryBlue,
+ dense: true,
+ //font change
+ title: Text(
+ widget.question['options'][index]['text'],
+ style: GoogleFonts.lato(
+ color: FeedbackColors.black87,
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ ),
+ ),
+ value: isChecked[index + 1],
+ onChanged: (bool value) {
+ if (!widget.showAnswer) {
+ if (value) {
+ if (!selectedOptions.contains(widget
+ .question['options'][index]['optionId'])) {
+ selectedOptions.add(widget.question['options']
+ [index]['optionId']);
+ }
+ } else {
+ if (selectedOptions.contains(widget
+ .question['options'][index]['optionId'])) {
+ selectedOptions.remove(widget.question['options']
+ [index]['optionId']);
+ }
+ }
+ widget.parentAction({
+ 'index': widget.question['questionId'],
+ 'isCorrect': widget.question['options'][index]
+ ['isCorrect'],
+ 'value': selectedOptions
+ });
+ setState(() {
+ isChecked[index + 1] = value;
+ });
+ }
+ }),
+ );
+ },
+ ),
+ ],
+ ));
+ }
+}
diff --git a/lib/widgets/questions/single_answer_question.dart b/lib/widgets/questions/single_answer_question.dart
new file mode 100644
index 0000000..fe4f67d
--- /dev/null
+++ b/lib/widgets/questions/single_answer_question.dart
@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import './../../../../models/_models/assessment_question_model.dart';
+import 'package:google_fonts/google_fonts.dart';
+import './../../../../constants/index.dart';
+
+class SingleAnswerQuestion extends StatefulWidget {
+ final AssessmentQuestion question;
+ SingleAnswerQuestion(this.question);
+ @override
+ _SingleAnswerQuestionState createState() => _SingleAnswerQuestionState();
+}
+
+class _SingleAnswerQuestionState extends State<SingleAnswerQuestion> {
+ int _radioValue = 0;
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ padding: const EdgeInsets.all(32),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ padding: const EdgeInsets.only(bottom: 15),
+ child: Text(
+ 'Q' + widget.question.id.toString() + ' of 3',
+ style: GoogleFonts.lato(
+ color: AppColors.greys60,
+ fontWeight: FontWeight.w400,
+ fontSize: 14.0,
+ ),
+ ),
+ ),
+ Container(
+ padding: const EdgeInsets.only(bottom: 15),
+ child: Text(
+ widget.question.question,
+ style: GoogleFonts.lato(
+ color: AppColors.greys87,
+ fontWeight: FontWeight.w600,
+ fontSize: 16.0,
+ ),
+ ),
+ ),
+ ListView.builder(
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemCount: widget.question.options.length,
+ itemBuilder: (context, index) {
+ return Container(
+ width: MediaQuery.of(context).size.width,
+ // padding: const EdgeInsets.all(15),
+ margin: const EdgeInsets.only(top: 10, bottom: 10),
+ decoration: BoxDecoration(
+ color: _radioValue == index + 1
+ ? Color.fromRGBO(0, 116, 182, 0.05)
+ : Colors.white,
+ borderRadius:
+ BorderRadius.all(const Radius.circular(4.0)),
+ border: Border.all(
+ color: _radioValue == index + 1
+ ? AppColors.primaryThree
+ : AppColors.grey16),
+ ),
+ child: RadioListTile(
+ groupValue: _radioValue,
+ title: Text(
+ widget.question.options[index],
+ style: GoogleFonts.lato(
+ color: AppColors.greys87,
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ ),
+ ),
+ value: index + 1,
+ onChanged: (value) {
+ setState(() {
+ _radioValue = value;
+ });
+ },
+ ));
+ },
+ ),
+ ],
+ ));
+ }
+}
diff --git a/lib/widgets/questions/text_question.dart b/lib/widgets/questions/text_question.dart
new file mode 100644
index 0000000..049cbc4
--- /dev/null
+++ b/lib/widgets/questions/text_question.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:smf_mobile/constants/app_constants.dart';
+import 'package:smf_mobile/constants/color_constants.dart';
+
+class TextQuestion extends StatefulWidget {
+ final String fieldType;
+ final String answerGiven;
+ final ValueChanged<String> parentAction;
+ const TextQuestion(
+ {Key? key,
+ required this.fieldType,
+ required this.answerGiven,
+ required this.parentAction})
+ : super(key: key);
+ @override
+ _TextQuestionState createState() => _TextQuestionState();
+}
+
+class _TextQuestionState extends State<TextQuestion> {
+ final TextEditingController _textController = TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+ _textController.text = widget.answerGiven;
+ }
+
+ @override
+ void dispose() {
+ _textController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ width: MediaQuery.of(context).size.width,
+ margin: const EdgeInsets.only(top: 15, bottom: 20),
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(4),
+ border: Border.all(color: AppColors.black16),
+ ),
+ child: Focus(
+ child: TextFormField(
+ onEditingComplete: () {
+ widget.parentAction(_textController.text);
+ SystemChannels.textInput.invokeMethod('TextInput.hide');
+ return;
+ },
+ controller: _textController,
+ style: GoogleFonts.lato(fontSize: 14.0),
+ textInputAction: TextInputAction.done,
+ textCapitalization: TextCapitalization.sentences,
+ keyboardType: widget.fieldType == FieldType.numeric
+ ? TextInputType.number
+ : widget.fieldType == FieldType.email
+ ? TextInputType.emailAddress
+ : TextInputType.name,
+ decoration: InputDecoration(
+ contentPadding: const EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0),
+ // border: OutlineInputBorder(
+ // borderSide: BorderSide(color: AppColors.grey16)),
+ // enabledBorder: const UnderlineInputBorder(
+ // borderSide: BorderSide(color: AppColors.black16),
+ // ),
+ // focusedBorder: const UnderlineInputBorder(
+ // borderSide: BorderSide(color: AppColors.primaryBlue),
+ // ),
+ border: InputBorder.none,
+ hintText: 'Type here',
+ hintStyle: GoogleFonts.lato(
+ color: AppColors.black40,
+ fontSize: 14.0,
+ fontWeight: FontWeight.w400),
+ // focusedBorder: OutlineInputBorder(
+ // borderSide: const BorderSide(
+ // color: AppColors.primaryThree, width: 1.0),
+ // ),
+ ),
+ ),
+ ));
+ }
+}
diff --git a/pubspec.lock b/pubspec.lock
index ebd138b..c6ffcc7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -118,6 +118,11 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
+ flutter_localizations:
+ dependency: "direct main"
+ description: flutter
+ source: sdk
+ version: "0.0.0"
flutter_secure_storage:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index bfa5c1b..9f80831 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,7 +29,8 @@ environment:
dependencies:
flutter:
sdk: flutter
-
+ flutter_localizations:
+ sdk: flutter
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
@@ -65,6 +66,7 @@ flutter:
# included with your application, so that you can use the icons in
# the material Icons class.
uses-material-design: true
+ generate: true
# To add assets to your application, add an assets section, like this:
assets:
--
GitLab