Skip to content

A
abook_check
Commit 7c75be21 by Lee Munkyeong
Options

#45377対応。

parent 4e8470d2
Showing with 35 additions and 4 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
...@@ -74,10 +74,12 @@ public class ABookKeys { ...@@ -74,10 +74,12 @@ public class ABookKeys {
public static final String CMD_PAGE_NUM = "pageNum"; public static final String CMD_PAGE_NUM = "pageNum";
public static final String CMD_GET_GROUP_TREE_INFO = "getGroupTreeInfo"; public static final String CMD_GET_GROUP_TREE_INFO = "getGroupTreeInfo";
public static final String CMD_CLOSE_TASK_LIST = "closeTaskList"; public static final String CMD_CLOSE_TASK_LIST = "closeTaskList";
public static final String CMD_PERMISSION_CHECK_FAIL = "permissionCheckFail";
public static final String GPS_TYPE = "gpsType"; public static final String GPS_TYPE = "gpsType";
public static final String STATUS_CODE = "statusCode"; public static final String STATUS_CODE = "statusCode";
public static final String TASK_KEY = "taskKey"; public static final String TASK_KEY = "taskKey";
public static final String IS_REGISTER = "isRegister";
public static final String TASK_CODE = "taskCode"; public static final String TASK_CODE = "taskCode";
public static final String TASK_NAME = "taskName"; public static final String TASK_NAME = "taskName";
public static final String REPORT_FILE_NAME = "fileName"; public static final String REPORT_FILE_NAME = "fileName";
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
...@@ -1031,7 +1031,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -1031,7 +1031,7 @@ public class OperationLogic extends AbstractLogic {
createProcessInfoJson(operationId, contentPath); createProcessInfoJson(operationId, contentPath);
createPhaseStatusJson(operationId, contentPath); createPhaseStatusJson(operationId, contentPath);
} else { } else {
if (routineTaskReportFlg) { if (routineTaskReportFlg || operationDto.reportType == Constant.ReportType.RoutineTask) {
// 定期点検 // 定期点検
createRoutineTaskReportJson(operationId, contentPath); createRoutineTaskReportJson(operationId, contentPath);
} else { } else {
......
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -1508,4 +1508,6 @@ ...@@ -1508,4 +1508,6 @@
<string name="btn_communication">コミュニケーション</string> <string name="btn_communication">コミュニケーション</string>
<string name="btn_setting">設定</string> <string name="btn_setting">設定</string>
<string name="btn_print">PDF</string> <string name="btn_print">PDF</string>
<string name="msg_not_allowed_creating_process">作業登録権限がありません。</string>
<string name="msg_not_allowed_access_process">担当工程がありません。</string>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -1513,4 +1513,6 @@ ...@@ -1513,4 +1513,6 @@
<string name="btn_communication">커뮤니케이션</string> <string name="btn_communication">커뮤니케이션</string>
<string name="btn_setting">설정</string> <string name="btn_setting">설정</string>
<string name="btn_print">PDF</string> <string name="btn_print">PDF</string>
<string name="msg_not_allowed_creating_process">등록권한이 없습니다.</string>
<string name="msg_not_allowed_access_process">담당 공정이 없습니다.</string>
</resources> </resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -1497,6 +1497,8 @@ ...@@ -1497,6 +1497,8 @@
<string name="error_fail_record">Recording failed. Please contact the administrator.</string> <string name="error_fail_record">Recording failed. Please contact the administrator.</string>
<string name="chat_open_fail_meeting_connected">Can’t open chat room during distance support. </string> <string name="chat_open_fail_meeting_connected">Can’t open chat room during distance support. </string>
<string name="chat_open_fail_collaborattion_connected">Chat rooms cannot be opened while the document collaboration is connected.</string> <string name="chat_open_fail_collaborattion_connected">Chat rooms cannot be opened while the document collaboration is connected.</string>
<string name="msg_not_allowed_creating_process">You do not have the right to register for work.</string>
<string name="msg_not_allowed_access_process">There was no accessable process</string>
<!-- Communication 会議室 --> <!-- Communication 会議室 -->
<string name="msg_error_favorites_100_over">You can have up to 100 favorites.</string> <string name="msg_error_favorites_100_over">You can have up to 100 favorites.</string>
<string name="msg_eroor_network_offline">There is no network connected.</string> <string name="msg_eroor_network_offline">There is no network connected.</string>
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -74,6 +74,7 @@ import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper; ...@@ -74,6 +74,7 @@ import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper; import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper; import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity; import jp.agentec.abook.abv.ui.viewer.activity.CheckOZDViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.ContentViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity; import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.NoPdfViewActivity; import jp.agentec.abook.abv.ui.viewer.activity.NoPdfViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.PhotoEditActivity; import jp.agentec.abook.abv.ui.viewer.activity.PhotoEditActivity;
...@@ -148,7 +149,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -148,7 +149,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
protected PhotoEditActivity mPhotoEditDialog; protected PhotoEditActivity mPhotoEditDialog;
protected boolean isCollaboration = false; protected boolean isCollaboration = false;
protected boolean isOpenedOperationTask = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -955,6 +956,17 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -955,6 +956,17 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
if (abookCheckParam.containsKey(ABookKeys.PHASE_NO)) { if (abookCheckParam.containsKey(ABookKeys.PHASE_NO)) {
phaseNo = Integer.parseInt(abookCheckParam.get(ABookKeys.PHASE_NO)); phaseNo = Integer.parseInt(abookCheckParam.get(ABookKeys.PHASE_NO));
} }
if (ABookKeys.CMD_PERMISSION_CHECK_FAIL.equals(mCmd)) {
boolean regPermission = Boolean.parseBoolean(abookCheckParam.get(ABookKeys.IS_REGISTER));
if (regPermission) {
showSimpleAlertDialog(R.string.error, R.string.msg_not_allowed_creating_process);
} else {
showSimpleAlertDialog(R.string.error, R.string.msg_not_allowed_access_process);
}
ContentViewActivity contentViewActivity = (ContentViewActivity)ActivityHandlingHelper.getInstance().getContentViewActivity();
contentViewActivity.changeIconStatus(mTaskKey, true);
isOpenedOperationTask = false;
}
if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_MOVE_HOT_SPOT, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT, if (StringUtil.equalsAny(mCmd, ABookKeys.CMD_MOVE_HOT_SPOT, ABookKeys.CMD_INSERT_TASK_REPORT, ABookKeys.CMD_UPDATE_TASK_REPORT,
ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT, ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT, ABookKeys.CMD_CHANGE_TASK_REPORT, ABookKeys.CMD_DELETE_PROCESS)) { ABookKeys.CMD_DELETE_TASK_REPORT, ABookKeys.CMD_CANCEL_TASK_REPORT, ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT, ABookKeys.CMD_CHANGE_TASK_REPORT, ABookKeys.CMD_DELETE_PROCESS)) {
...@@ -1015,7 +1027,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1015,7 +1027,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
closeProgressPopup(); closeProgressPopup();
syncOperation(mOperationId, mReportType, false); syncOperation(mOperationId, mReportType, false);
try { try {
mOperationLogic.createJsonForOperationContent(mOperationId, mContentPath, false); mOperationLogic.createJsonForOperationContent(mOperationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask);
} catch (IOException e) { } catch (IOException e) {
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -70,6 +70,7 @@ import android.widget.Toast; ...@@ -70,6 +70,7 @@ import android.widget.Toast;
import android.widget.ToggleButton; import android.widget.ToggleButton;
import com.foxit.sdk.PDFException; import com.foxit.sdk.PDFException;
import com.theta.model.Constants;
import org.json.adf.JSONArray; import org.json.adf.JSONArray;
import org.json.adf.JSONException; import org.json.adf.JSONException;
...@@ -278,7 +279,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -278,7 +279,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
// 作業指示、作業報告 // 作業指示、作業報告
private OperationTaskLayout operationTaskLayout; private OperationTaskLayout operationTaskLayout;
private LinearLayout mScaleZoomLayout; private LinearLayout mScaleZoomLayout;
private boolean isOpenedOperationTask = false;
private TaskHotspotJSON mTaskHotspotJSON; private TaskHotspotJSON mTaskHotspotJSON;
// 移動・タップモードの切り替えボタン // 移動・タップモードの切り替えボタン
protected ImageButton btnMoveOrClickToggleIcon; protected ImageButton btnMoveOrClickToggleIcon;
...@@ -5389,6 +5390,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5389,6 +5390,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
operationTaskLayout.showTaskForm(layout, mXWalkOpenType, operationTaskDto, isNormalSize(), clickX); operationTaskLayout.showTaskForm(layout, mXWalkOpenType, operationTaskDto, isNormalSize(), clickX);
// 拡大・縮小・切替ボタンの非表示 // 拡大・縮小・切替ボタンの非表示
mScaleZoomLayout.setVisibility(View.INVISIBLE); mScaleZoomLayout.setVisibility(View.INVISIBLE);
isOpenedOperationTask = true; isOpenedOperationTask = true;
} }
...@@ -5462,12 +5464,14 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5462,12 +5464,14 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
} }
} else { } else {
if (isOpenedOperationTask) {
operationTaskLayout.setIconStatus(taskKey, true); operationTaskLayout.setIconStatus(taskKey, true);
operationTaskLayout.currentTaskDto.taskKey = taskKey; operationTaskLayout.currentTaskDto.taskKey = taskKey;
operationTaskLayout.currentTaskDto.taskCode = taskCode; operationTaskLayout.currentTaskDto.taskCode = taskCode;
operationTaskLayout.currentTaskDto.isFinished = operationTaskLayout.isTaskFinished(taskKey); operationTaskLayout.currentTaskDto.isFinished = operationTaskLayout.isTaskFinished(taskKey);
operationTaskLayout.addOperationTaskIcon(operationTaskLayout.currentLayout, operationTaskLayout.currentTaskDto); operationTaskLayout.addOperationTaskIcon(operationTaskLayout.currentLayout, operationTaskLayout.currentTaskDto);
} }
}
} else { } else {
operationTaskLayout.setIconStatus(taskKey, true); operationTaskLayout.setIconStatus(taskKey, true);
...@@ -5685,5 +5689,11 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5685,5 +5689,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
return isCollaboration; return isCollaboration;
} }
public void changeIconStatus(String taskKey,boolean isDelete) {
setOperationCurrentLayout(mCurrentPageNumber);
operationTaskLayout.setIconStatus(taskKey, true);
operationTaskLayout.currentTaskDto = null;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment