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 1cc81b0063c6b7da208a45280d062a7d8d4c3940..d7e09780a62a0a83e10811bb397b9254a457d63e 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 { - // ToDo API修正待ち(通知メッセージは削除) - // 通知メッセージ - const val NOTIFICATION_MESSAGE = "MESSAGE" // 下書き const val DRAFT = "DRAFT" // 申請依頼 @@ -30,9 +27,8 @@ data class ApprovalInfo( const val CHECK_REPORT = "CHECK_REPORT" // 督促あり const val DEMAND = "DEMAND" - // ToDo API修正待ち(回付予定) // 回付予定 - //const val CIRCULATION = "CIRCULATION" + 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 64bb29ec203cb9a49a024dd38f889bf2fb1d85d5..149c85f38b0747cc906c2f322534c6bac3f3fa2f 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,13 @@ class AwAppWidget : AwAppWidgetBase( R.layout.aw_app_widget, // 全種類 (明示的に指定しない設計にしたかったが、通信不能時にもサイズ決定したい都合上こうしている) arrayOf( - // ToDo API修正待ち(通知メッセージは削除) - ApprovalInfo.NOTIFICATION_MESSAGE, ApprovalInfo.DRAFT, ApprovalInfo.REQUEST_APPLICATION, ApprovalInfo.REQUEST_APPROVAL, ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - // ToDo API修正待ち(回付予定) - //ApprovalInfo.CIRCULATION, + 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 8e6eddb48930a22686ce314b32e1c3db3ae64b7f..88d9bc69195998c9c661f89a41053741166f94e1 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,15 @@ 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設定用 削除予定 when (approvalInfoCode) { - // ToDo 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" } // 回付予定 + ApprovalInfo.FUTURE_PASS -> {return baseUrl + "FuturePass" } // 回付予定 ApprovalInfo.SHARE -> {return baseUrl + "Share" } // 共有した ApprovalInfo.SHARED -> {return baseUrl + "Shared" } // 共有された else -> {return ""}