From 6125d40d9e4dd347121408813ac68a2c3700a0c7 Mon Sep 17 00:00:00 2001 From: Gk40002148 Date: Wed, 2 Mar 2022 13:01:53 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E8=A1=A8=E7=A4=BA=E6=A9=9F=E8=83=BD=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AgileWorks.xcodeproj/project.pbxproj | 40 +++++ .../Profile/Cell/ProfileTableViewCell.swift | 30 ++++ .../View/ProfileTableViewController.swift | 118 +++++++++++++ .../View/ProfileViewController.storyboard | 161 ++++++++++++++++++ .../Profile/View/ProfileViewController.swift | 38 +++++ .../Strings/Chinese-Simplified.strings | 10 ++ .../Strings/Chinese-Traditional.strings | 10 ++ AgileWorks/AgileWorks/Strings/English.strings | 10 ++ .../AgileWorks/Strings/Japanese.strings | 10 ++ .../Strings/en.lproj/Localizable.strings | 10 ++ .../Strings/ja.lproj/Localizable.strings | 10 ++ .../Strings/zh-Hans.lproj/Localizable.strings | 10 ++ .../Strings/zh-Hant.lproj/Localizable.strings | 10 ++ .../View/MenuTableViewController.swift | 12 +- .../WebView/View/WebViewController.storyboard | 12 +- 15 files changed, 484 insertions(+), 7 deletions(-) create mode 100644 AgileWorks/AgileWorks/Profile/Cell/ProfileTableViewCell.swift create mode 100644 AgileWorks/AgileWorks/Profile/View/ProfileTableViewController.swift create mode 100644 AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard create mode 100644 AgileWorks/AgileWorks/Profile/View/ProfileViewController.swift diff --git a/AgileWorks/AgileWorks.xcodeproj/project.pbxproj b/AgileWorks/AgileWorks.xcodeproj/project.pbxproj index 2ec4c6f..c8c12fd 100644 --- a/AgileWorks/AgileWorks.xcodeproj/project.pbxproj +++ b/AgileWorks/AgileWorks.xcodeproj/project.pbxproj @@ -143,9 +143,13 @@ BDEB7D8E23F5293900EFAF31 /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = BDEB7D8D23F5293800EFAF31 /* Podfile */; }; BDEE85F82408A887006A6BF7 /* MainTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDEE85F72408A887006A6BF7 /* MainTabBarViewController.swift */; }; C51EF0E92769FA2E00361B38 /* WebViewScriptMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C51EF0E82769FA2E00361B38 /* WebViewScriptMessageHandler.swift */; }; + C5285D3927CCB3C8006A9182 /* ProfileTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5285D3827CCB3C8006A9182 /* ProfileTableViewCell.swift */; }; C535772C2754D12600EAA660 /* WebViewBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C535772B2754D12600EAA660 /* WebViewBuilder.swift */; }; C535772E2754D5C500EAA660 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C535772D2754D5C500EAA660 /* WebViewController.swift */; }; C53577372758AC1100EAA660 /* WebViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C53577362758AC1100EAA660 /* WebViewController.storyboard */; }; + C57DCAAA27C89692000A2ABC /* ProfileViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C57DCAA927C89692000A2ABC /* ProfileViewController.storyboard */; }; + C57DCAAE27C89823000A2ABC /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C57DCAAD27C89823000A2ABC /* ProfileViewController.swift */; }; + C57DCAB027C8AEFC000A2ABC /* ProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C57DCAAF27C8AEFC000A2ABC /* ProfileTableViewController.swift */; }; C5848EB827BC8EBC00AA796D /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5848EB727BC8EBB00AA796D /* MenuViewController.swift */; }; C5848EBA27BCE0F100AA796D /* MenuTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5848EB927BCE0F100AA796D /* MenuTableViewController.swift */; }; C5E5A4C827853BEF00668C7D /* QRCodeReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E5A4C727853BEF00668C7D /* QRCodeReader.swift */; }; @@ -318,9 +322,13 @@ BDEB7D8F23F530A400EFAF31 /* KeychainAccess.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = KeychainAccess.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BDEE85F72408A887006A6BF7 /* MainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarViewController.swift; sourceTree = ""; }; C51EF0E82769FA2E00361B38 /* WebViewScriptMessageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewScriptMessageHandler.swift; sourceTree = ""; }; + C5285D3827CCB3C8006A9182 /* ProfileTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTableViewCell.swift; sourceTree = ""; }; C535772B2754D12600EAA660 /* WebViewBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewBuilder.swift; sourceTree = ""; }; C535772D2754D5C500EAA660 /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = ""; }; C53577362758AC1100EAA660 /* WebViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WebViewController.storyboard; sourceTree = ""; }; + C57DCAA927C89692000A2ABC /* ProfileViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ProfileViewController.storyboard; sourceTree = ""; }; + C57DCAAD27C89823000A2ABC /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; + C57DCAAF27C8AEFC000A2ABC /* ProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTableViewController.swift; sourceTree = ""; }; C5848EB727BC8EBB00AA796D /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = ""; }; C5848EB927BCE0F100AA796D /* MenuTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuTableViewController.swift; sourceTree = ""; }; C5E5A4C727853BEF00668C7D /* QRCodeReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeReader.swift; sourceTree = ""; }; @@ -781,6 +789,7 @@ 10KG4F3WB4G6KBATKIMPQIG1 /* Login */, 57NGKUX7FAI41Q8MMQ9MWB6V /* Main */, C53577282754D02400EAA660 /* WebView */, + C57DCAA727C8954B000A2ABC /* Profile */, 3107AA7B243B369900F23BFB /* Form */, 76AE52DB25D358D700AFA45A /* License */, BDEB7D8D23F5293800EFAF31 /* Podfile */, @@ -812,6 +821,14 @@ path = WebClient; sourceTree = ""; }; + C5285D3727CCB3A1006A9182 /* Cell */ = { + isa = PBXGroup; + children = ( + C5285D3827CCB3C8006A9182 /* ProfileTableViewCell.swift */, + ); + path = Cell; + sourceTree = ""; + }; C53577282754D02400EAA660 /* WebView */ = { isa = PBXGroup; children = ( @@ -841,6 +858,25 @@ path = View; sourceTree = ""; }; + C57DCAA727C8954B000A2ABC /* Profile */ = { + isa = PBXGroup; + children = ( + C5285D3727CCB3A1006A9182 /* Cell */, + C57DCAA827C8956A000A2ABC /* View */, + ); + path = Profile; + sourceTree = ""; + }; + C57DCAA827C8956A000A2ABC /* View */ = { + isa = PBXGroup; + children = ( + C57DCAA927C89692000A2ABC /* ProfileViewController.storyboard */, + C57DCAAD27C89823000A2ABC /* ProfileViewController.swift */, + C57DCAAF27C8AEFC000A2ABC /* ProfileTableViewController.swift */, + ); + path = View; + sourceTree = ""; + }; ETCUTRCSRVUF3YT1U0HUMDJ4 /* Splash */ = { isa = PBXGroup; children = ( @@ -1067,6 +1103,7 @@ 76C4996C24E5097200759B93 /* GoogleService-Info-Production.plist in Resources */, I07ZJPNVIS069WBRK1L3WPOY /* MainViewController.storyboard in Resources */, 75917FA227BDF2250051E201 /* Chinese-Traditional.strings in Resources */, + C57DCAAA27C89692000A2ABC /* ProfileViewController.storyboard in Resources */, 3A1F975224AF2D0000AE6A42 /* ModalFullCollectionViewController.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1239,10 +1276,12 @@ BDBBF83A243C9EA900EEB25D /* GetSubmissionsEndpoint.swift in Sources */, BDAABA1D24A3627B0077EC69 /* DeviceResponse.swift in Sources */, BDA1832B23F4079400C9A6DD /* RootViewController.swift in Sources */, + C57DCAAE27C89823000A2ABC /* ProfileViewController.swift in Sources */, OZPVEGK5OCQVK53RHNWXAVSG /* LoginViewController.swift in Sources */, DO2X5NYERJY3QMXCZGA5H9OJ /* LoginBuilder.swift in Sources */, BDBBF83B243C9EAB00EEB25D /* GetSubmissionsIDEndpoint.swift in Sources */, 76D1DC1E2592FE3400429C70 /* GetDocumentInfoEndpoint.swift in Sources */, + C57DCAB027C8AEFC000A2ABC /* ProfileTableViewController.swift in Sources */, 3A1F975424AF2D6700AE6A42 /* ModalFullCollectionViewController.swift in Sources */, BD8D55D92420609000A667B0 /* XCGLoggerExtensions.swift in Sources */, 76AE533325D37B0200AFA45A /* LicenseViewPresenter.swift in Sources */, @@ -1258,6 +1297,7 @@ C5848EBA27BCE0F100AA796D /* MenuTableViewController.swift in Sources */, 7604950425380980000D6951 /* FirebaseSupport.swift in Sources */, BDBBF839243C9EA600EEB25D /* GetApprovalsIDEndpoint.swift in Sources */, + C5285D3927CCB3C8006A9182 /* ProfileTableViewCell.swift in Sources */, UMOPI6WFDHHR8CWFUZDQE9U2 /* LoginUseCase.swift in Sources */, 31253D962417A56200525DB6 /* FormWebViewController.swift in Sources */, BD6C1AED24A480C70057756F /* DeviceService.swift in Sources */, diff --git a/AgileWorks/AgileWorks/Profile/Cell/ProfileTableViewCell.swift b/AgileWorks/AgileWorks/Profile/Cell/ProfileTableViewCell.swift new file mode 100644 index 0000000..e8c62a8 --- /dev/null +++ b/AgileWorks/AgileWorks/Profile/Cell/ProfileTableViewCell.swift @@ -0,0 +1,30 @@ +// +// ProfileTableViewCell.swift +// AgileWorks +// +// Created by Gk40002148 on 2022/02/28. +// Copyright © 2022 ATLED CORP. All rights reserved. +// + +import UIKit + +class ProfileTableViewCell: UITableViewCell { + @IBOutlet private var subject: UILabel! + @IBOutlet private var title: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + + func configure(subject: String, title: String) { + self.subject.text = subject + self.title.text = title + } +} diff --git a/AgileWorks/AgileWorks/Profile/View/ProfileTableViewController.swift b/AgileWorks/AgileWorks/Profile/View/ProfileTableViewController.swift new file mode 100644 index 0000000..7f02139 --- /dev/null +++ b/AgileWorks/AgileWorks/Profile/View/ProfileTableViewController.swift @@ -0,0 +1,118 @@ +// +// ProfileTableViewController.swift +// AgileWorks +// +// Created by Gk40002148 on 2022/02/25. +// Copyright © 2022 ATLED CORP. All rights reserved. +// + +import UIKit + +// TableViewSection タイプ +private enum SectionType: Int, CaseIterable { + case userInfo = 0 + case unit +} + +// UserSection タイプ +private enum UserInfoType: Int, CaseIterable { + case code = 0 + case name + case loginId +} + +// UnitSection タイプ +private enum UnitType: Int, CaseIterable { + case name = 0 + case role +} + +class ProfileTableViewController: UITableViewController { + var sessionInfo: SessionInfo? + + override func viewDidLoad() { + super.viewDidLoad() + tableView.sectionFooterHeight = 0.0 + // セッション情報より、プロファイル情報取得 + loadSessionInfo() + } + // セッション情報取得 + private func loadSessionInfo() { + let sessionEndpoint = GetSessionEndpoint() + Session.send(sessionEndpoint) { result in + switch result { + case .success(let response): + self.sessionInfo = response + DispatchQueue.main.async { + self.tableView.reloadData() + } + case .failure: + break + } + } + } + + override func numberOfSections(in tableView: UITableView) -> Int { + return SectionType.allCases.count + } + + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + if section == SectionType.userInfo.rawValue { + return UserInfoType.allCases.count + } else if section == SectionType.unit.rawValue { + return UnitType.allCases.count + } + return 0 + } + override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + if section == SectionType.userInfo.rawValue { + return localizadString(key: "UserInfoHeader", comment: "") + } else if section == SectionType.unit.rawValue { + return localizadString(key: "UnitInfoHeader", comment: "") + } + return "" + } + override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 40 + } + override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell = tableView.dequeueReusableCell(withIdentifier: "ProfileTableViewCell") as! ProfileTableViewCell + + var subject = "" + var title = "" + if indexPath.section == SectionType.userInfo.rawValue { + // ユーザ情報表示 + switch indexPath.row { + case UserInfoType.code.rawValue: + subject = localizadString(key: "UserCodeTitle", comment: "") + title = sessionInfo?.user.code ?? "" + case UserInfoType.name.rawValue: + subject = localizadString(key: "UserNameTitle", comment: "") + title = sessionInfo?.user.name ?? "" + case UserInfoType.loginId.rawValue: + subject = localizadString(key: "LoginIdTitle", comment: "") + title = sessionInfo?.user.loginId ?? "" + default: + break + } + } else if indexPath.section == SectionType.unit.rawValue { + // 組織関連（mainUnit = true を表示） + if let units = sessionInfo?.unit { + for unit in units where unit.mainUnit { + switch indexPath.row { + case UnitType.name.rawValue: + subject = localizadString(key: "UnitNameTitle", comment: "") + title = unit.name + case UnitType.role.rawValue: + subject = localizadString(key: "RoleNameTitle", comment: "") + title = unit.sectionRoleName + default: + break + } + } + } + } + cell.configure(subject: subject, title: title) + return cell + } +} diff --git a/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard new file mode 100644 index 0000000..743a9f9 --- /dev/null +++ b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AgileWorks/AgileWorks/Profile/View/ProfileViewController.swift b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.swift new file mode 100644 index 0000000..4123056 --- /dev/null +++ b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.swift @@ -0,0 +1,38 @@ +// +// ProfileViewController.swift +// AgileWorks +// +// Created by Gk40002148 on 2022/02/25. +// Copyright © 2022 ATLED CORP. All rights reserved. +// + +import UIKit + +class ProfileViewController: UIViewController { + @IBOutlet private var profileLabel: UILabel! + @IBOutlet private var closeButton: UIButton! + + override func viewDidLoad() { + super.viewDidLoad() + + setupLabel() + } + + private func setupLabel() { + profileLabel.text = localizadString(key: "ProfileTitle", comment: "") + closeButton.setTitle(localizadString(key: "CloseButton", comment: ""), for: .normal) + } + + override func touchesEnded(_ touches: Set, with event: UIEvent?) { + super.touchesEnded(touches, with: event) + for touch in touches where touch.view?.tag == 1 { + // メニューエリア外タップ時の処理 + // 閉じるボタンと同じ動作 + dismiss(animated: true, completion: nil) + } + } + // 閉じるボタンタップ時動作 + @IBAction private func closeTapped() { + dismiss(animated: true, completion: nil) + } +} diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings index c0fb7e8..e882e6a 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "用户信息"; +"UnitInfoHeader" = "所属组织(主组织)"; +"UserCodeTitle" = "用户代码"; +"UserNameTitle" = "用户名"; +"LoginIdTitle" = "登录ID"; +"UnitNameTitle" = "组织"; +"RoleNameTitle" = "职位"; +"CloseButton" = "关闭"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings index 37a66ee..0ee7f7f 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "用戶信息"; +"UnitInfoHeader" = "隸屬組織(主組織)"; +"UserCodeTitle" = "用戶代碼"; +"UserNameTitle" = "用戶名"; +"LoginIdTitle" = "登入ID"; +"UnitNameTitle" = "組織"; +"RoleNameTitle" = "職位"; +"CloseButton" = "關閉"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/English.strings b/AgileWorks/AgileWorks/Strings/English.strings index 8bcd43b..35bebc6 100644 --- a/AgileWorks/AgileWorks/Strings/English.strings +++ b/AgileWorks/AgileWorks/Strings/English.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "User info"; +"UnitInfoHeader" = "Affiliated unit(main unit)"; +"UserCodeTitle" = "User code"; +"UserNameTitle" = "User name"; +"LoginIdTitle" = "Login ID"; +"UnitNameTitle" = "Unit"; +"RoleNameTitle" = "Role"; +"CloseButton" = "Close"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/Japanese.strings b/AgileWorks/AgileWorks/Strings/Japanese.strings index 0f32d65..1f87f3d 100644 --- a/AgileWorks/AgileWorks/Strings/Japanese.strings +++ b/AgileWorks/AgileWorks/Strings/Japanese.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "ユーザ情報"; +"UnitInfoHeader" = "所属する組織（主務）"; +"UserCodeTitle" = "ユーザコード"; +"UserNameTitle" = "ユーザ名"; +"LoginIdTitle" = "ログインID"; +"UnitNameTitle" = "組織"; +"RoleNameTitle" = "ロール"; +"CloseButton" = "閉じる"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings index 1335f6f..8980a08 100644 --- a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "User info"; +"UnitInfoHeader" = "Affiliated unit(main unit)"; +"UserCodeTitle" = "User code"; +"UserNameTitle" = "User name"; +"LoginIdTitle" = "Login ID"; +"UnitNameTitle" = "Unit"; +"RoleNameTitle" = "Role"; +"CloseButton" = "Close"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings index c2a90d9..6fb261f 100644 --- a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "ユーザ情報"; +"UnitInfoHeader" = "所属する組織（主務）"; +"UserCodeTitle" = "ユーザコード"; +"UserNameTitle" = "ユーザ名"; +"LoginIdTitle" = "ログインID"; +"UnitNameTitle" = "組織"; +"RoleNameTitle" = "ロール"; +"CloseButton" = "閉じる"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings index e675cda..775939a 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "用户信息"; +"UnitInfoHeader" = "所属组织(主组织)"; +"UserCodeTitle" = "用户代码"; +"UserNameTitle" = "用户名"; +"LoginIdTitle" = "登录ID"; +"UnitNameTitle" = "组织"; +"RoleNameTitle" = "职位"; +"CloseButton" = "关闭"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings index c46f769..acee261 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings @@ -38,6 +38,16 @@ "LicenseTitle" = "ライセンス"; "OpenLicenseTitle" = "オープンソースライセンス"; +// Profile +"UserInfoHeader" = "用戶信息"; +"UnitInfoHeader" = "隸屬組織(主組織)"; +"UserCodeTitle" = "用戶代碼"; +"UserNameTitle" = "用戶名"; +"LoginIdTitle" = "登入ID"; +"UnitNameTitle" = "組織"; +"RoleNameTitle" = "職位"; +"CloseButton" = "關閉"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift index e571549..e56ff19 100644 --- a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift @@ -54,7 +54,17 @@ class MenuTableViewController: UITableViewController { // プロファイルセルタップ処理 private func pushToProfile() { // プロファイルタップ時処理 - print("プロファイル　タップ") + let storyboard = UIStoryboard(name: "ProfileViewController", bundle: nil) + let viewController = storyboard.instantiateViewController(withIdentifier: "ProfileViewController") + + viewController.modalPresentationStyle = .overFullScreen + viewController.modalTransitionStyle = .crossDissolve + + self.present(viewController, animated: false, completion: nil) + // セルの選択解除 + if let indexPath = self.tableView.indexPath(for: self.profileCell) { + self.tableView.deselectRow(at: indexPath, animated: true) + } } // ログアウトセルタップ処理 private func logout() { diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard index 176bcb7..b7eb59c 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard @@ -1,9 +1,9 @@ - + - + @@ -183,7 +183,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -252,7 +252,7 @@ - + -- GitLab