v1.1.5.1

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

diff --git a/TaskControlCommand/command/Control/CheckCommand.cs b/main/command/Control/CheckCommand.cs
similarity index 64%
rename from TaskControlCommand/command/Control/CheckCommand.cs
rename to main/command/Control/CheckCommand.cs
index cdafbf7..95c54ec 100644 (file)
--- a/TaskControlCommand/command/Control/CheckCommand.cs
+++ b/main/command/Control/CheckCommand.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 \r
 namespace com.andoutomo.kybernetes.command.Control\r
 {\r
-    class CheckCommand:AbCommand\r
+    class CheckCommand : EndCommand\r
     {\r
         CheckCommandArg param;\r
         protected override bool execute()\r
@@ -39,7 +39,7 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                                     CommentDataAccessor.getObject.insertComment(data);\r
                                 }\r
-                                return repeatCheck(target);\r
+                                return repeatCheck(target, param.sortID);\r
                             }\r
                             else\r
                             {\r
@@ -78,7 +78,7 @@ namespace com.andoutomo.kybernetes.command.Control
 \r
                             CommentDataAccessor.getObject.insertComment(data);\r
                         }\r
-                        return repeatCheck(target);\r
+                        return repeatCheck(target, param.sortID);\r
                     }\r
                     else\r
                     {\r
@@ -91,7 +91,7 @@ namespace com.andoutomo.kybernetes.command.Control
                 }\r
             }\r
         }\r
-        string message;\r
+        \r
 \r
         protected override string turnMessage()\r
         {\r
@@ -106,50 +106,5 @@ namespace com.andoutomo.kybernetes.command.Control
             }\r
             return message;\r
         }\r
-\r
-        protected override string turnSplitErrorMessage()\r
-        {\r
-            return base.DefaultSplitErrorMessage;\r
-        }\r
-        /// <summary>\r
-        /// \r
-        /// </summary>\r
-        /// <param name="_newData"></param>\r
-        /// <returns></returns>\r
-        private bool repeatCheck(TaskData _newData)\r
-        {\r
-            if (TaskDataAccessor.getObject.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
-\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
-                else\r
-                {\r
-                    //リピートしないと判断したならそこで終了。\r
-                    return true;\r
-                }\r
-            }\r
-            else\r
-            {\r
-                //リピート対象でないなら何もしない\r
-                return true;\r
-            }\r
-        }\r
-        \r
     }\r
 }\r