v1.1.5.1

[kybernetes/Kybernetes.git] / main / command / Control / ReportCommand.cs

diff --git a/TaskControlCommand/command/Control/ReportCommand.cs b/main/command/Control/ReportCommand.cs
similarity index 50%
rename from TaskControlCommand/command/Control/ReportCommand.cs
rename to main/command/Control/ReportCommand.cs
index 47b54fe..d1c0264 100644 (file)
--- a/TaskControlCommand/command/Control/ReportCommand.cs
+++ b/main/command/Control/ReportCommand.cs
@@ -10,15 +10,16 @@ using System.Windows.Forms;
 \r
 namespace com.andoutomo.kybernetes.command.Control\r
 {\r
-    class ReportCommand:AbCommand\r
+    class ReportCommand : EndCommand\r
     {\r
-        string message;\r
+        \r
         ReportCommandArg param;\r
         protected override bool execute()\r
         {\r
             param = (ReportCommandArg)argument;\r
+            TaskDataAccessor accessor = TaskDataAccessor.getObject;\r
 \r
-            TaskData _newData = TaskDataAccessor.getObject.getTask(param.sortID);\r
+            TaskData _newData = accessor.getTask(param.sortID);\r
             if (_newData == null)\r
             {\r
                 base.errorType = ErrorType.DataNotFound;\r
@@ -26,7 +27,7 @@ namespace com.andoutomo.kybernetes.command.Control
             }\r
             if (_newData.StartTime == null || _newData.StartTime.IsValid == false)\r
             {\r
-                TaskDataAccessor.getObject.startTask(_newData.SortID, TaskDataAccessor.getObject.getNextStartTime(_newData.DoDate));\r
+                accessor.startTask(_newData.SortID, accessor.getNextStartTime(_newData.DoDate));\r
             }\r
             if(_newData.EndTime != null && _newData.EndTime.IsValid == true){\r
                 if (!YesNoDialog.show("本タスクは既に終了しています。終了時間を更新しますか？"))\r
@@ -35,7 +36,7 @@ namespace com.andoutomo.kybernetes.command.Control
                     return true;\r
                 }\r
             }\r
-            if (TaskDataAccessor.getObject.endTask(param.sortID, param.reportTime))\r
+            if (accessor.endTask(param.sortID, param.reportTime))\r
             {\r
                 string endingComment = form.showInputBox("お疲れ様でした。本タスクへのコメントをどうぞ。", ImeMode.Hiragana);\r
                 if (!string.IsNullOrEmpty(endingComment))\r
@@ -46,26 +47,10 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                     CommentDataAccessor.getObject.insertComment(data);\r
                 }\r
-                if (TaskDataAccessor.getObject.isRepeatTask(param.sortID))\r
+                if (accessor.isRepeatTask(param.sortID))\r
                 {\r
-                    string nextDay = form.showInputBox("次回は何日後ですか？0の場合は繰り返しません。","1");\r
-                    if (nextDay != "0")\r
-                    {\r
-                        _newData.DoDate.addDate(int.Parse(nextDay));\r
-                        _newData.TaskID = TaskDataAccessor.getObject.getMaxTaskID();\r
-                        _newData.SortID = TaskDataAccessor.getObject.getMaxSortID();\r
+                    return repeatCheck(_newData, param.sortID);\r
 \r
-\r
-                        //_newData.CategID = CategoryDataAccessor.getObject.getCategoryFromName(_newData.Category).CategId;\r
-\r
-                        TaskDataAccessor.getObject.insertTask(_newData);\r
-\r
-                        //リピート対象としたタスクは複製後もリピート対象とする。\r
-                        TaskDataAccessor.getObject.setRepeatTask(_newData.SortID, true);\r
-\r
-                        message = "タスク " + param.sortID + " を終了します。次回は" + _newData.DoDate.getDateString() + "です。";\r
-                        return true;\r
-                    }\r
                 }\r
                 message = "タスク " + param.sortID + " を終了します。";\r
                 return true;\r
@@ -77,15 +62,5 @@ namespace com.andoutomo.kybernetes.command.Control
         {\r
             return message;\r
         }\r
-\r
-        protected override string turnErrorMessage()\r
-        {\r
-            return base.DefaultErrorMessage;\r
-        }\r
-\r
-        protected override string turnSplitErrorMessage()\r
-        {\r
-            return base.DefaultSplitErrorMessage;\r
-        }\r
     }\r
 }\r