Merge pull request #408 from avinyafoundation/main

enrollment api bal version updated and student profile WIP
avinyafoundation · Sep 30, 2024 · 78c6afb · 78c6afb
2 parents 8fa77cc + cf702c9
commit 78c6afb
Show file tree

Hide file tree

Showing 22 changed files with 1,853 additions and 78 deletions.
diff --git a/campus/bffs/enrollment/api/Ballerina.toml b/campus/bffs/enrollment/api/Ballerina.toml
@@ -1,8 +1,8 @@
 [package]
 org = "avinyafoundation"
 name = "enrollment_bff"
-version = "1.1.0"
-distribution = "2201.5.0"
+version = "2.1.0"
+distribution = "2201.8.7"
 
 [build-options]
 observabilityIncluded = true
diff --git a/campus/bffs/enrollment/api/types.bal b/campus/bffs/enrollment/api/types.bal
@@ -7,6 +7,7 @@ public type Address record {
     string? record_type?;
     int city_id?;
     string name_en?;
+    City? city?;
 };
 
 public type AvinyaType record {

diff --git a/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal b/campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal
@@ -71,6 +71,7 @@ public type ActivitySequencePlan record {
 public type Address record {
     string street_address?;
     int? phone?;
+    City? city?;
     int? id?;
     string? record_type?;
     int city_id?;
@@ -134,6 +135,21 @@ public type AvinyaType record {
     string global_type?;
 };
 
+public type City record {
+    string? suburb_name_en?;
+    string? suburb_name_si?;
+    string? name_ta?;
+    string? suburb_name_ta?;
+    anydata latitude?;
+    string? postcode?;
+    string? name_si?;
+    int? id?;
+    int? district_id?;
+    string? record_type?;
+    string name_en?;
+    anydata longitude?;
+};
+
 public type Consumable record {
     string? created?;
     int? avinya_type_id?;

diff --git a/campus/bffs/enrollment/graphql_client/schema.graphql b/campus/bffs/enrollment/graphql_client/schema.graphql
@@ -166,6 +166,7 @@ input Address {
   street_address: String!
   phone: Int
   city_id: Int!
+  city: City
 }
 
 type AddressData {
@@ -309,6 +310,21 @@ type AvinyaTypeData {
   description: String
 }
 
+input City {
+  record_type: String = "city"
+  id: Int
+  district_id: Int
+  suburb_name_en: String
+  suburb_name_ta: String
+  suburb_name_si: String
+  postcode: String
+  name_en: String!
+  name_ta: String
+  name_si: String
+  latitude: Decimal!
+  longitude: Decimal!
+}
+
 type CityData {
   name: LocalizedName!
   id: Int

diff --git a/campus/bffs/enrollment/graphql_client/schema.json b/campus/bffs/enrollment/graphql_client/schema.json
@@ -3137,6 +3137,15 @@
                                 }
                             },
                             "defaultValue": null
+                        },
+                        {
+                            "name": "city",
+                            "type": {
+                                "kind": "INPUT_OBJECT",
+                                "name": "City",
+                                "ofType": null
+                            },
+                            "defaultValue": null
                         }
                     ],
                     "interfaces": null,
@@ -6162,6 +6171,136 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "INPUT_OBJECT",
+                    "name": "City",
+                    "fields": null,
+                    "inputFields": [
+                        {
+                            "name": "record_type",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": "\"city\""
+                        },
+                        {
+                            "name": "id",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Int",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "district_id",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Int",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "suburb_name_en",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "suburb_name_ta",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "suburb_name_si",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "postcode",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "name_en",
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "name_ta",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "name_si",
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "latitude",
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "Decimal",
+                                    "ofType": null
+                                }
+                            },
+                            "defaultValue": null
+                        },
+                        {
+                            "name": "longitude",
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "Decimal",
+                                    "ofType": null
+                                }
+                            },
+                            "defaultValue": null
+                        }
+                    ],
+                    "interfaces": null,
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "InventoryData",

diff --git a/campus/frontend/.fvmrc b/campus/frontend/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.13.1"
+}
diff --git a/campus/frontend/.gitignore b/campus/frontend/.gitignore
@@ -0,0 +1,3 @@
+
+# FVM Version Cache
+.fvm/
diff --git a/campus/frontend/.vscode/settings.json b/campus/frontend/.vscode/settings.json
@@ -1,7 +1,8 @@
 {
-    "githubPullRequests.ignoredPullRequestBranches": [
-        "main"
-    ],
-    "editor.formatOnSave": true,
-    "editor.formatOnPaste": true
+  "githubPullRequests.ignoredPullRequestBranches": [
+    "main"
+  ],
+  "editor.formatOnSave": true,
+  "editor.formatOnPaste": true,
+  "dart.flutterSdkPath": ".fvm/versions/3.13.1"
 }
diff --git a/campus/frontend/assets/config/dev-cloud.json b/campus/frontend/assets/config/dev-cloud.json
@@ -1,12 +1,11 @@
 {
-    "campusProfileBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/1.0.0",
-    "campusAttendanceBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/1.0.0",
-    "campusPctiNotesBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
-    "campusPctiFeedbackBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
-    "campusAssetsBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/1.0.0",
-    "choreo_sts_endpoint" : "https://sts.choreo.dev/oauth2/token",
-    "asgardeo_token_endpoint" : "https://api.asgardeo.io/t/avinyatest/oauth2/token",
-    "logout_url" : "https://api.asgardeo.io/t/avinyatest/oidc/logout"
-}
-
-
+    "campusProfileBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/1.0.0",
+    "campusAttendanceBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/1.0.0",
+    "campusPctiNotesBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
+    "campusPctiFeedbackBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
+    "campusAssetsBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/1.0.0",
+    "campusEnrollmentsBffApiUrl": "http://localhost:9095",
+    "choreo_sts_endpoint": "https://sts.choreo.dev/oauth2/token",
+    "asgardeo_token_endpoint": "https://api.asgardeo.io/t/avinyatest/oauth2/token",
+    "logout_url": "https://api.asgardeo.io/t/avinyatest/oidc/logout"
+}
diff --git a/campus/frontend/assets/config/dev.json b/campus/frontend/assets/config/dev.json
@@ -1,12 +1,11 @@
 {
-    "campusProfileBffApiUrl" : "http://localhost:9090",
-    "campusAttendanceBffApiUrl" : "http://localhost:9091",
-    "campusPctiNotesBffApiUrl" : "http://localhost:9092",
-    "campusPctiFeedbackBffApiUrl" : "http://localhost:9093",
-    "campusAssetsBffApiUrl" : "http://localhost:9094",
-    "choreo_sts_endpoint" : "https://sts.choreo.dev/oauth2/token",
-    "asgardeo_token_endpoint" : "https://api.asgardeo.io/t/avinyatest/oauth2/token",
-    "logout_url" : "https://api.asgardeo.io/t/avinyatest/oidc/logout"
-}
-
-
+    "campusProfileBffApiUrl": "http://localhost:9090",
+    "campusAttendanceBffApiUrl": "http://localhost:9091",
+    "campusPctiNotesBffApiUrl": "http://localhost:9092",
+    "campusPctiFeedbackBffApiUrl": "http://localhost:9093",
+    "campusAssetsBffApiUrl": "http://localhost:9094",
+    "campusEnrollmentsBffApiUrl": "http://localhost:9095",
+    "choreo_sts_endpoint": "https://sts.choreo.dev/oauth2/token",
+    "asgardeo_token_endpoint": "https://api.asgardeo.io/t/avinyatest/oauth2/token",
+    "logout_url": "https://api.asgardeo.io/t/avinyatest/oidc/logout"
+}
diff --git a/campus/frontend/assets/config/prod.json b/campus/frontend/assets/config/prod.json
@@ -1,12 +1,11 @@
 {
-    "campusProfileBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/0.9.0",
-    "campusAttendanceBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/0.9.0",
-    "campusPctiNotesBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
-    "campusPctiFeedbackBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
-    "campusAssetsBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/0.9.0",
-    "choreo_sts_endpoint" : "https://sts.choreo.dev/oauth2/token",
-    "asgardeo_token_endpoint" : "https://api.asgardeo.io/t/avinyaacademy/oauth2/token",
-    "logout_url" : "https://api.asgardeo.io/t/avinyaacademy/oidc/logout"
-}
-
-
+    "campusProfileBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/0.9.0",
+    "campusAttendanceBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/0.9.0",
+    "campusPctiNotesBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
+    "campusPctiFeedbackBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
+    "campusAssetsBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-prod.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/0.9.0",
+    "campusEnrollmentsBffApiUrl": "http://localhost:9095",
+    "choreo_sts_endpoint": "https://sts.choreo.dev/oauth2/token",
+    "asgardeo_token_endpoint": "https://api.asgardeo.io/t/avinyaacademy/oauth2/token",
+    "logout_url": "https://api.asgardeo.io/t/avinyaacademy/oidc/logout"
+}
diff --git a/campus/frontend/assets/config/stag.json b/campus/frontend/assets/config/stag.json
@@ -1,12 +1,11 @@
 {
-    "campusProfileBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/0.9.0",
-    "campusAttendanceBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/0.9.0",
-    "campusPctiNotesBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
-    "campusPctiFeedbackBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
-    "campusAssetsBffApiUrl" : "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/0.9.0",
-    "choreo_sts_endpoint" : "https://sts.choreo.dev/oauth2/token",
-    "asgardeo_token_endpoint" : "https://api.asgardeo.io/t/avinyaacademy/oauth2/token",
-    "logout_url" : "https://api.asgardeo.io/t/avinyaacademy/oidc/logout"
-}
-
-
+    "campusProfileBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/profile-bff/0.9.0",
+    "campusAttendanceBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/attendance-bff/0.9.0",
+    "campusPctiNotesBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-notes-bff/1.0.0",
+    "campusPctiFeedbackBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/pcti-feedback-bff/1.0.0",
+    "campusAssetsBffApiUrl": "https://3a907137-52a3-4196-9e0d-22d054ea5789-dev.e1-us-east-azure.choreoapis.dev/fieg/asset-bff/0.9.0",
+    "campusEnrollmentsBffApiUrl": "http://localhost:9095",
+    "choreo_sts_endpoint": "https://sts.choreo.dev/oauth2/token",
+    "asgardeo_token_endpoint": "https://api.asgardeo.io/t/avinyaacademy/oauth2/token",
+    "logout_url": "https://api.asgardeo.io/t/avinyaacademy/oidc/logout"
+}
diff --git a/campus/frontend/assets/images/student_profile_male.jpg b/campus/frontend/assets/images/student_profile_male.jpg