Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enrollment api bal version updated and student profile WIP #408

Merged
merged 14 commits into from
Sep 30, 2024
Merged

enrollment api bal version updated and student profile WIP #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c7890e7
Students Enrolment interfaces WIP
YujithIsura Sep 23, 2024
edd7b63
Merge remote-tracking branch 'upstream/main'
YujithIsura Sep 23, 2024
bf66b19
student update WIP
YujithIsura Sep 26, 2024
324ff13
Merge remote-tracking branch 'upstream/main'
YujithIsura Sep 26, 2024
dc988d6
lint
YujithIsura Sep 26, 2024
8f3a1c7
student profile WIP
YujithIsura Sep 29, 2024
87e3947
Merge remote-tracking branch 'upstream/main'
YujithIsura Sep 29, 2024
3033228
student profile WIP
YujithIsura Sep 30, 2024
cd72b92
Merge remote-tracking branch 'upstream/main'
YujithIsura Sep 30, 2024
ed00a00
enrollment bff types changes added
lahirulakruwan Sep 30, 2024
473d4a0
Merge pull request #406 from lahirulakruwan/main
YujithIsura Sep 30, 2024
c9fe56b
bal versioon updated
YujithIsura Sep 30, 2024
9c7a020
Merge remote-tracking branch 'upstream/main'
YujithIsura Sep 30, 2024
cf702c9
Merge pull request #407 from YujithIsura/main
YujithIsura Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions campus/bffs/enrollment/api/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions campus/bffs/enrollment/api/types.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public type Address record {
string? record_type?;
int city_id?;
string name_en?;
City? city?;
};

public type AvinyaType record {
Expand Down
16 changes: 16 additions & 0 deletions campus/bffs/enrollment/graphql_client/graphql_client_cg_src/types.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?;
Expand Down Expand Up @@ -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?;
Expand Down
16 changes: 16 additions & 0 deletions campus/bffs/enrollment/graphql_client/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ input Address {
street_address: String!
phone: Int
city_id: Int!
city: City
}

type AddressData {
Expand Down Expand Up @@ -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
Expand Down
139 changes: 139 additions & 0 deletions campus/bffs/enrollment/graphql_client/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3137,6 +3137,15 @@
}
},
"defaultValue": null
},
{
"name": "city",
"type": {
"kind": "INPUT_OBJECT",
"name": "City",
"ofType": null
},
"defaultValue": null
}
],
"interfaces": null,
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions campus/frontend/.fvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.13.1"
}
3 changes: 3 additions & 0 deletions campus/frontend/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

# FVM Version Cache
.fvm/
11 changes: 6 additions & 5 deletions campus/frontend/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
21 changes: 10 additions & 11 deletions campus/frontend/assets/config/dev-cloud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
21 changes: 10 additions & 11 deletions campus/frontend/assets/config/dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
21 changes: 10 additions & 11 deletions campus/frontend/assets/config/prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
21 changes: 10 additions & 11 deletions campus/frontend/assets/config/stag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Binary file added campus/frontend/assets/images/student_profile_male.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading