1.1.4

.mailmap

@@ -0,0 +1,3 @@
+Charles Richardson <charlesrichardsonusa@gmail.com> charlieforward9 <charlesrichardsonusa@gmail.com>
+Charles Richardson <charlesrichardsonusa@gmail.com> charlieforward9 <62311337+charlieforward9@users.noreply.github.com> 
+Charles Richardson <charlesrichardsonusa@gmail.com> Charles Richardson <62311337+charlieforward9@users.noreply.github.com>

amplify/backend/api/visualpt/cli-inputs.json

@@ -4,17 +4,12 @@
     "apiName": "visualpt",
     "serviceName": "AppSync",
     "defaultAuthType": {
-      "mode": "API_KEY",
-      "keyDescription": "api key description",
-      "expirationTime": 30
+      "mode": "AMAZON_COGNITO_USER_POOLS",
+      "cognitoUserPoolId": "authvisualpt"
     },
     "additionalAuthTypes": [
       {
         "mode": "AWS_IAM"
-      },
-      {
-        "mode": "AMAZON_COGNITO_USER_POOLS",
-        "cognitoUserPoolId": "authvisualpt"
       }
     ],
     "conflictResolution": {

amplify/backend/api/visualpt/parameters.json

@@ -8,5 +8,5 @@
       "Outputs.UserPoolId"
     ]
   },
-  "AuthModeLastUpdated": "2024-05-05T02:49:18.520Z"
+  "AuthModeLastUpdated": "2024-09-18T03:43:56.263Z"
 }

amplify/backend/api/visualpt/schema.graphql

@@ -13,15 +13,31 @@ enum Gender {
   FEMALE
 }
 
+enum AgeRange {
+  BABY_0_5
+  CHILD_6_12
+  TEEN_13_19
+  ADULT_20_39
+  ADULT_40_64
+  SENIOR_65_69
+  SENIOR_70_79
+  SENIOR_80_84
+  SENIOR_85_89
+}
+
 enum AssessmentType {
   CTSIB
+  MCTSIB
   GAIT
   BERG
   REACH
   FIST
+  DEV
 }
 
-type User @model @auth(rules: [{ allow: public }]) {
+type User
+  @model
+  @auth(rules: [{ allow: groups, groups: ["Admin"] }, { allow: owner }]) {
   id: ID!
   email: AWSEmail!
   first_name: String!
@@ -30,7 +46,9 @@ type User @model @auth(rules: [{ allow: public }]) {
   Subjects: [Subject!] @hasMany(indexName: "byUser", fields: ["id"])
 }
 
-type Subject @model @auth(rules: [{ allow: owner }]) {
+type Subject
+  @model
+  @auth(rules: [{ allow: groups, groups: ["Admin"] }, { allow: owner }]) {
   id: ID!
   userID: ID! @index(name: "byUser")
   first_name: String!
@@ -43,7 +61,9 @@ type Subject @model @auth(rules: [{ allow: owner }]) {
   Assessments: [Assessment!] @hasMany(indexName: "bySubject", fields: ["id"])
 }
 
-type Assessment @model @auth(rules: [{ allow: owner }]) {
+type Assessment
+  @model
+  @auth(rules: [{ allow: groups, groups: ["Admin"] }, { allow: owner }]) {
   id: ID!
   subjectID: ID! @index(name: "bySubject")
   type: AssessmentType!
@@ -53,22 +73,36 @@ type Assessment @model @auth(rules: [{ allow: owner }]) {
   Conditions: [Condition!] @hasMany(indexName: "byAssessment", fields: ["id"])
 }
 
-type Condition @model @auth(rules: [{ allow: owner }]) {
+type Condition
+  @model
+  @auth(rules: [{ allow: groups, groups: ["Admin"] }, { allow: owner }]) {
   id: ID!
   assessmentID: ID! @index(name: "byAssessment")
   sequenceNumber: Int!
   duration: Float! #seconds
   trials: [Trial!] @hasMany(indexName: "byCondition", fields: ["id"])
 }
 
-type Trial @model @auth(rules: [{ allow: owner }]) {
+type Trial
+  @model
+  @auth(rules: [{ allow: groups, groups: ["Admin"] }, { allow: owner }]) {
   id: ID!
   conditionID: ID! @index(name: "byCondition")
   start_time: AWSDateTime!
   duration: Float! #seconds
   Detections: [Detection!]
 }
 
+type Norm @model @auth(rules: [{ allow: private }]) {
+  id: ID!
+  type: AssessmentType!
+  sequenceNumber: Int!
+  age_range: AgeRange!
+  gender: Gender!
+  score_sum: Float!
+  trial_sum: Int!
+}
+
 type Detection {
   id: String!
   version: Int!

amplify/backend/backend-config.json

@@ -15,20 +15,13 @@
           "additionalAuthenticationProviders": [
             {
               "authenticationType": "AWS_IAM"
-            },
-            {
-              "authenticationType": "AMAZON_COGNITO_USER_POOLS",
-              "userPoolConfig": {
-                "userPoolId": "authvisualpt"
-              }
             }
           ],
           "defaultAuthentication": {
-            "apiKeyConfig": {
-              "apiKeyExpirationDays": 30,
-              "description": "api key description"
-            },
-            "authenticationType": "API_KEY"
+            "authenticationType": "AMAZON_COGNITO_USER_POOLS",
+            "userPoolConfig": {
+              "userPoolId": "authvisualpt"
+            }
           }
         }
       },

amplify/backend/types/amplify-dependent-resources-ref.d.ts

@@ -2,8 +2,7 @@ export type AmplifyDependentResourcesAttributes = {
   "api": {
     "visualpt": {
       "GraphQLAPIEndpointOutput": "string",
-      "GraphQLAPIIdOutput": "string",
-      "GraphQLAPIKeyOutput": "string"
+      "GraphQLAPIIdOutput": "string"
     }
   },
   "auth": {

lib/amplifyconfiguration.dart

@@ -8,8 +8,7 @@ const amplifyconfig = '''{
                     "endpointType": "GraphQL",
                     "endpoint": "https://pzdub2f2czghti3zlrepb5awv4.appsync-api.us-east-1.amazonaws.com/graphql",
                     "region": "us-east-1",
-                    "authorizationType": "API_KEY",
-                    "apiKey": "da2-uj6vhfa3mna7hfwciugu7juooq"
+                    "authorizationType": "AMAZON_COGNITO_USER_POOLS"
                 }
             }
         }
@@ -26,21 +25,14 @@ const amplifyconfig = '''{
                     "Default": {
                         "ApiUrl": "https://pzdub2f2czghti3zlrepb5awv4.appsync-api.us-east-1.amazonaws.com/graphql",
                         "Region": "us-east-1",
-                        "AuthMode": "API_KEY",
-                        "ApiKey": "da2-uj6vhfa3mna7hfwciugu7juooq",
-                        "ClientDatabasePrefix": "visualpt_API_KEY"
+                        "AuthMode": "AMAZON_COGNITO_USER_POOLS",
+                        "ClientDatabasePrefix": "visualpt_AMAZON_COGNITO_USER_POOLS"
                     },
                     "visualpt_AWS_IAM": {
                         "ApiUrl": "https://pzdub2f2czghti3zlrepb5awv4.appsync-api.us-east-1.amazonaws.com/graphql",
                         "Region": "us-east-1",
                         "AuthMode": "AWS_IAM",
                         "ClientDatabasePrefix": "visualpt_AWS_IAM"
-                    },
-                    "visualpt_AMAZON_COGNITO_USER_POOLS": {
-                        "ApiUrl": "https://pzdub2f2czghti3zlrepb5awv4.appsync-api.us-east-1.amazonaws.com/graphql",
-                        "Region": "us-east-1",
-                        "AuthMode": "AMAZON_COGNITO_USER_POOLS",
-                        "ClientDatabasePrefix": "visualpt_AMAZON_COGNITO_USER_POOLS"
                     }
                 },
                 "CredentialsProvider": {

lib/core/services/repository.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:visualpt/features/assessment/types.dart';
 
 abstract class Repository<I, O> {
-  final AssessmentMeta meta;
+  final TrialMeta meta;
   final StreamController<I> _streamController;
   var isInitialized = false;
   var count = 0;
@@ -24,6 +24,10 @@ abstract class Repository<I, O> {
   Future<O?> runPredict(String id, I input, Map<String, dynamic>? params);
   Future<void> store(
       String id, I input, O output, Map<String, dynamic>? params);
+  void reset() {
+    localStorage.clear();
+    count = 0;
+  }
 
   void dispose() {
     _streamController.close();

lib/core/views/base_view.dart

@@ -5,10 +5,15 @@ import 'package:visualpt/features/assessment/view/components/assessment_instruct
 
 class BaseView extends StatefulWidget {
   const BaseView(
-      {super.key, required this.child, this.instructions, this.pageTitle});
+      {super.key,
+      required this.child,
+      this.instructions,
+      this.pageTitle,
+      this.poppable = true});
   final Widget child;
   final AssessmentInstructions? instructions;
   final String? pageTitle;
+  final bool poppable;
 
   @override
   State<BaseView> createState() => _BaseViewState();
@@ -17,76 +22,95 @@ class BaseView extends StatefulWidget {
 class _BaseViewState extends State<BaseView> {
   bool showInstructions = true;
 
+  @override
+  void initState() {
+    super.initState();
+    setState(() {
+      showInstructions = widget.instructions == null ? false : true;
+    });
+  }
+
   @override
   void didUpdateWidget(BaseView oldWidget) {
     super.didUpdateWidget(oldWidget);
     setState(() => showInstructions = true);
   }
 
+  bool _canPop() {
+    if (!widget.poppable || showInstructions) {
+      return false;
+    }
+    return true; // Allow navigation otherwise
+  }
+
   @override
   Widget build(BuildContext context) {
     final screenSize = MediaQuery.of(context).size;
 
-    return Stack(alignment: Alignment.center, children: [
-      CupertinoPageScaffold(
-          navigationBar: CupertinoNavigationBar(
-            backgroundColor: Styles.backgroundAccent,
-            middle: ConstrainedBox(
-                constraints: BoxConstraints(
-                    maxWidth: MediaQuery.of(context).size.width * 0.75),
-                child: widget.pageTitle == null
-                    ? const Image(
-                        image: AssetImage(Styles.mainLogoPath),
-                        fit: BoxFit.fitWidth)
-                    : Text(
-                        widget.pageTitle!,
-                        style: Styles.heading3,
-                        textAlign: TextAlign.center,
-                      )),
-            trailing: widget.pageTitle == null
-                ? GestureDetector(
-                    onTap: () => Navigator.pushNamed(context, "/settings"),
-                    child: const Icon(
-                      CupertinoIcons.settings,
-                      color: Styles.black,
-                    ))
-                : widget.instructions != null
-                    ? GestureDetector(
-                        onTap: () => setState(
-                            () => showInstructions = !showInstructions),
-                        child: const Icon(
-                          CupertinoIcons.info,
-                          color: Styles.black,
-                        ))
-                    : null,
-          ),
-          child: SizedBox(
-            height: screenSize.height,
-            width: screenSize.width,
-            child: Stack(alignment: Alignment.center, children: [
-              const ViewBackground(),
-              SafeArea(
-                child: widget.child,
-              )
-            ]),
-          )),
-      //InstructionModal below
-      showInstructions && widget.instructions != null
-          ? Container(
-              alignment: Alignment.center,
+    return PopScope(
+      canPop: _canPop(), // Override back button behavior
+      child: Stack(alignment: Alignment.center, children: [
+        CupertinoPageScaffold(
+            navigationBar: CupertinoNavigationBar(
+              automaticallyImplyLeading: _canPop() ? true : false,
+              backgroundColor: Styles.backgroundAccent,
+              middle: ConstrainedBox(
+                  constraints: BoxConstraints(
+                      maxWidth: MediaQuery.of(context).size.width * 0.75),
+                  child: widget.pageTitle == null
+                      ? const Image(
+                          image: AssetImage(Styles.mainLogoPath),
+                          fit: BoxFit.fitWidth)
+                      : Text(
+                          widget.pageTitle!,
+                          style: Styles.heading3,
+                          textAlign: TextAlign.center,
+                        )),
+              trailing: widget.pageTitle == null
+                  ? GestureDetector(
+                      onTap: () => Navigator.pushNamed(context, "/settings"),
+                      child: const Icon(
+                        CupertinoIcons.settings,
+                        color: Styles.black,
+                      ))
+                  : widget.instructions != null
+                      ? GestureDetector(
+                          onTap: () => setState(
+                              () => showInstructions = !showInstructions),
+                          child: const Icon(
+                            CupertinoIcons.info,
+                            color: Styles.black,
+                          ))
+                      : null,
+            ),
+            child: SizedBox(
               height: screenSize.height,
               width: screenSize.width,
-              color: Styles.black.withOpacity(0.5),
-              child: GestureDetector(
-                  child: Container(
-                      height: screenSize.height * 0.8,
-                      width: screenSize.width * 0.8,
-                      decoration: const BoxDecoration(
-                          borderRadius: Styles.borderRadiusM,
-                          color: Styles.ceruleanBlue),
-                      child: widget.instructions),
-                  onTap: () => setState(() => showInstructions = false)))
-          : Container()
-    ]);
+              child: Stack(alignment: Alignment.center, children: [
+                const ViewBackground(),
+                SafeArea(
+                  child: widget.child,
+                )
+              ]),
+            )),
+        // InstructionModal below
+        showInstructions && widget.instructions != null
+            ? Container(
+                alignment: Alignment.center,
+                height: screenSize.height,
+                width: screenSize.width,
+                color: Styles.black.withOpacity(0.5),
+                child: GestureDetector(
+                    child: Container(
+                        height: screenSize.height * 0.9,
+                        width: screenSize.width * 0.9,
+                        decoration: const BoxDecoration(
+                            borderRadius: Styles.borderRadiusM,
+                            color: Styles.ceruleanBlue),
+                        child: widget.instructions),
+                    onTap: () => setState(() => showInstructions = false)))
+            : Container()
+      ]),
+    );
   }
 }