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

機構申請 #120

Merged
merged 3 commits into from
Sep 14, 2020
Merged

機構申請 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30273f1
Update db
chunyenHuang Sep 12, 2020
988e46e
Merge branch 'develop' into feature/orgApplication
chunyenHuang Sep 14, 2020
24a04e8
bump ios build version
chunyenHuang Sep 14, 2020
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
38 changes: 38 additions & 0 deletions amplify/backend/api/piggybankofhappiness/schema/ApplicationOrganization.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
type ApplicationOrganization
@model
@key(name: "byStatusByUpdate", fields: ["status", "updatedAt"], queryField: "getApplicationByStatusByUpdate")
@auth(rules: [
{allow: owner, ownerField: "username", operations: [read]},
{allow: groups, groups: ["AppAdmins"]},
])
{
id: ID!
username: String! # 機構負責人帳號

name: String! # 機構名稱
registeredName: String! # 政府立案名稱
taxIdNumber: String! # 統一編號
description: String! # 描述
phoneNumber: String!
email: String!
address: Address!

comments: [ApplicationOrganizationComment]

status: ApplicationOrganizationStatus!
createdAt: AWSDateTime!
updatedAt: AWSDateTime!
}

enum ApplicationOrganizationStatus {
Pending
Waiting For Additional Documents
Approved
Rejected
}

type ApplicationOrganizationComment {
createdAt: AWSDateTime!
createdBy: String!
comment: String!
}
7 changes: 7 additions & 0 deletions amplify/backend/api/piggybankofhappiness/schema/Organization.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ type Organization
id: ID!
name: String!
description: String!
# from application
registeredName: String
taxIdNumber: String
phoneNumber: String
email: String
address: Address

isActive: Int!
createdAt: AWSDateTime!
updatedAt: AWSDateTime!
Expand Down
7 changes: 7 additions & 0 deletions amplify/backend/api/piggybankofhappiness/schema/Types.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,11 @@ enum TaskStatusType {
In progress
Completed
Failed
}

type Address {
county: String! # 台北市
district: String! # 信義區
street: String! # 市府路45號
zipCode: String! # 11060
}
2 changes: 1 addition & 1 deletion mobile/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"ios": {
"usesAppleSignIn": true,
"supportsTablet": true,
"buildNumber": "45",
"buildNumber": "47",
"bundleIdentifier": "cloud.goldax.piggy-bank-of-happiness",
"infoPlist": {}
},
Expand Down