Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
7e53583d
Commit
7e53583d
authored
Feb 17, 2023
by
Kazuyuki Hida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
命名のゆれを修正
parent
983574e5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ReportStatusDao.java
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+0
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
+1
-1
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ReportStatusDao.java
View file @
7e53583d
...
...
@@ -79,7 +79,7 @@ public class ReportStatusDao extends AbstractDao {
return
sql
;
}
public
List
<
ReportStatusDto
>
get
Untouch
edReport
()
{
public
List
<
ReportStatusDto
>
get
NotStart
edReport
()
{
StringBuilder
sql
=
reportStatusSql
();
sql
.
append
(
"WHERE t_task_report_status.untouched_flg <> 0"
);
return
rawQueryGetDtoList
(
sql
.
toString
(),
new
String
[]
{},
ReportStatusDto
.
class
);
...
...
@@ -238,7 +238,7 @@ public class ReportStatusDao extends AbstractDao {
4:期限切れ、5:アラート、
6:差し戻し、7:一時保存
*/
list
.
add
(
makeDto
(
0
,
get
Untouch
edReport
().
size
()));
list
.
add
(
makeDto
(
0
,
get
NotStart
edReport
().
size
()));
list
.
add
(
makeDto
(
1
,
getWorkingReport
().
size
()));
list
.
add
(
makeDto
(
2
,
getCompleteOkReport
().
size
()));
list
.
add
(
makeDto
(
3
,
getCompleteNgReport
().
size
()));
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
View file @
7e53583d
...
...
@@ -986,7 +986,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// データを同期する fixme かなり邪道なことをしているので、非同期処理全体を整理する必要がある
ActivityHandlingHelper
helper
=
ActivityHandlingHelper
.
getInstance
();
helper
.
getPreviousOperationListActivity
().
syncOperation
(
operationDto
.
operationId
,
operationDto
.
reportType
,
false
);
ABVEnvironment
env
=
ABVEnvironment
.
getInstance
();
OperationLogic
logic
=
AbstractLogic
.
getLogic
(
OperationLogic
.
class
);
try
{
logic
.
createJsonForOperationContent
(
operationDto
.
operationId
,
mContentPath
,
operationDto
.
reportType
==
Constant
.
ReportType
.
RoutineTask
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
View file @
7e53583d
...
...
@@ -334,7 +334,7 @@ public class DashboardActivity extends OperationActivity {
List
<
ReportStatusDto
>
reports
=
null
;
switch
(
reportStatusId
)
{
case
0
:
{
reports
=
dao
.
get
Untouch
edReport
();
reports
=
dao
.
get
NotStart
edReport
();
break
;
}
case
1
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment