From db07e448a3f6ffd6b0bb8d51d48a92e125e48607 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Mon, 9 May 2022 14:03:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#36=20API=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=83=9D=E3=83=B3=E3=82=B9=E3=81=AB=E5=BF=9C?= =?UTF-8?q?=E3=81=98=E3=81=9F=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AE=E8=A1=A8=E7=A4=BA=E9=A0=85=E7=9B=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atled/agileworks/model/ApiApprovalResponse.kt | 9 ++++----- .../java/jp/atled/agileworks/widget/AwAppWidget.kt | 8 ++++---- .../widget/AwAppWidgetRemoteViewsFactory.kt | 13 +++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt index 1cc81b00..2f23759b 100644 --- a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt +++ b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt @@ -15,9 +15,9 @@ data class ApprovalInfo( val count: Int ) { companion object { - // ToDo API修正待ち(通知メッセージは削除) + // API修正待ち(通知メッセージは残しておく) // 通知メッセージ - const val NOTIFICATION_MESSAGE = "MESSAGE" + //const val NOTIFICATION_MESSAGE = "MESSAGE" // 下書き const val DRAFT = "DRAFT" // 申請依頼 @@ -30,9 +30,8 @@ data class ApprovalInfo( const val CHECK_REPORT = "CHECK_REPORT" // 督促あり const val DEMAND = "DEMAND" - // ToDo API修正待ち(回付予定) - // 回付予定 - //const val CIRCULATION = "CIRCULATION" + // API修正前に回付予定に対応 + const val FUTURE_PASS = "FUTURE_PASS" // 共有した const val SHARE = "SHARE" // 共有された diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt index 64bb29ec..75c92082 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -106,16 +106,16 @@ class AwAppWidget : AwAppWidgetBase( R.layout.aw_app_widget, // 全種類 (明示的に指定しない設計にしたかったが、通信不能時にもサイズ決定したい都合上こうしている) arrayOf( - // ToDo API修正待ち(通知メッセージは削除) - ApprovalInfo.NOTIFICATION_MESSAGE, + // API修正待ち(通知メッセージは残しておく) + //ApprovalInfo.NOTIFICATION_MESSAGE, ApprovalInfo.DRAFT, ApprovalInfo.REQUEST_APPLICATION, ApprovalInfo.REQUEST_APPROVAL, ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - // ToDo API修正待ち(回付予定) - //ApprovalInfo.CIRCULATION, + // API修正前に対応(回付予定) + ApprovalInfo.FUTURE_PASS, ApprovalInfo.SHARE, ApprovalInfo.SHARED)) class AwAppWidgetApproveOnly : AwAppWidgetBase( diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index 8e6eddb4..d1b59745 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -119,7 +119,7 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? override fun getCount(): Int { Log.d(TAG, "call getCount(): " + (widgetItems?.count() ?: 0)) - return approvalFilterCodes.size + return widgetItems?.count() ?: approvalFilterCodes.size } override fun getViewTypeCount(): Int { @@ -174,19 +174,20 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? private fun getTransitionDestinationUrl(approvalInfoCode: String): String { val baseUrl = AwApp.Baseurl() + "Broker/Mobile#docList_" - val debugUrl = AwApp.Baseurl() + "Broker/Document" // ToDo 仮URL設定用 削除予定 + // 仮URL設定用 削除予定 + // val debugUrl = AwApp.Baseurl() + "Broker/Document" when (approvalInfoCode) { - // ToDo API修正待ち(通知メッセージは削除) - ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$debugUrl?DocId=171" } // 通知メッセージ + // API修正待ち(通知メッセージは残しておく) + //ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$debugUrl?DocId=171" } // 通知メッセージ ApprovalInfo.DRAFT -> {return baseUrl + "Draft" } // 下書き ApprovalInfo.REQUEST_APPLICATION -> {return baseUrl + "RequestApplication" } // 申請依頼 ApprovalInfo.REQUEST_APPROVAL -> {return baseUrl + "RequestApproval" } // 承認依頼 ApprovalInfo.REMAND -> {return baseUrl + "Remand" } // 差戻し ApprovalInfo.CHECK_REPORT -> {return baseUrl + "CheckReport" } // 報告確認 ApprovalInfo.DEMAND -> {return baseUrl + "HasDemand" } // 督促あり - // ToDo API修正待ち - //ApprovalInfo.CIRCULATION -> {return baseUrl + "FuturePass" } // 回付予定 + // API修正前に回付予定に対応 + ApprovalInfo.FUTURE_PASS -> {return baseUrl + "FuturePass" } // 回付予定 ApprovalInfo.SHARE -> {return baseUrl + "Share" } // 共有した ApprovalInfo.SHARED -> {return baseUrl + "Shared" } // 共有された else -> {return ""} -- GitLab From e77d7b1e5bb088bac8d9bf325c2be041849b84d1 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Mon, 9 May 2022 15:24:38 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#36=20=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/atled/agileworks/model/ApiApprovalResponse.kt | 5 +---- .../main/java/jp/atled/agileworks/widget/AwAppWidget.kt | 3 --- .../agileworks/widget/AwAppWidgetRemoteViewsFactory.kt | 7 +------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt index 2f23759b..d7e09780 100644 --- a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt +++ b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt @@ -15,9 +15,6 @@ data class ApprovalInfo( val count: Int ) { companion object { - // API修正待ち(通知メッセージは残しておく) - // 通知メッセージ - //const val NOTIFICATION_MESSAGE = "MESSAGE" // 下書き const val DRAFT = "DRAFT" // 申請依頼 @@ -30,7 +27,7 @@ data class ApprovalInfo( const val CHECK_REPORT = "CHECK_REPORT" // 督促あり const val DEMAND = "DEMAND" - // API修正前に回付予定に対応 + // 回付予定 const val FUTURE_PASS = "FUTURE_PASS" // 共有した const val SHARE = "SHARE" diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt index 75c92082..149c85f3 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -106,15 +106,12 @@ class AwAppWidget : AwAppWidgetBase( R.layout.aw_app_widget, // 全種類 (明示的に指定しない設計にしたかったが、通信不能時にもサイズ決定したい都合上こうしている) arrayOf( - // API修正待ち(通知メッセージは残しておく) - //ApprovalInfo.NOTIFICATION_MESSAGE, ApprovalInfo.DRAFT, ApprovalInfo.REQUEST_APPLICATION, ApprovalInfo.REQUEST_APPROVAL, ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - // API修正前に対応(回付予定) ApprovalInfo.FUTURE_PASS, ApprovalInfo.SHARE, ApprovalInfo.SHARED)) diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index d1b59745..88d9bc69 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -174,20 +174,15 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? private fun getTransitionDestinationUrl(approvalInfoCode: String): String { val baseUrl = AwApp.Baseurl() + "Broker/Mobile#docList_" - // 仮URL設定用 削除予定 - // val debugUrl = AwApp.Baseurl() + "Broker/Document" when (approvalInfoCode) { - // API修正待ち(通知メッセージは残しておく) - //ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$debugUrl?DocId=171" } // 通知メッセージ ApprovalInfo.DRAFT -> {return baseUrl + "Draft" } // 下書き ApprovalInfo.REQUEST_APPLICATION -> {return baseUrl + "RequestApplication" } // 申請依頼 ApprovalInfo.REQUEST_APPROVAL -> {return baseUrl + "RequestApproval" } // 承認依頼 ApprovalInfo.REMAND -> {return baseUrl + "Remand" } // 差戻し ApprovalInfo.CHECK_REPORT -> {return baseUrl + "CheckReport" } // 報告確認 ApprovalInfo.DEMAND -> {return baseUrl + "HasDemand" } // 督促あり - // API修正前に回付予定に対応 - ApprovalInfo.FUTURE_PASS -> {return baseUrl + "FuturePass" } // 回付予定 + ApprovalInfo.FUTURE_PASS -> {return baseUrl + "FuturePass" } // 回付予定 ApprovalInfo.SHARE -> {return baseUrl + "Share" } // 共有した ApprovalInfo.SHARED -> {return baseUrl + "Shared" } // 共有された else -> {return ""} -- GitLab