ｖ1.1.6.6

[kybernetes/Kybernetes.git] / main / command / CRUD / AddCommand.cs

diff --git a/main/command/CRUD/AddCommand.cs b/main/command/CRUD/AddCommand.cs
index 15a174b..f6590f3 100644 (file)
--- a/main/command/CRUD/AddCommand.cs
+++ b/main/command/CRUD/AddCommand.cs
@@ -15,6 +15,7 @@ namespace com.andoutomo.kybernetes.command
         {\r
             AddCommandArgs addArgs = (AddCommandArgs)base.argument;\r
             TaskData data = addArgs.PreparedTaskData;\r
+            TaskDataAccessor taskAccessor = TaskDataAccessor.getObject;\r
 \r
             if (data.Contents == null)\r
             {\r
@@ -64,39 +65,48 @@ namespace com.andoutomo.kybernetes.command
                 }\r
                 data.TimeArea = wkTimeArea.ToUpper();\r
             }\r
-            if (data.Category == null)\r
+            if (data.CategID == 0)\r
             {\r
-                CategoryDataAccessor dataAccessor = CategoryDataAccessor.getObject;\r
-                //string wkStr = form.showInputBox("カテゴリを記入してください。");\r
-                List<CategoryData> allList = dataAccessor.getAllCategory();\r
-                List<SimpleDataBean> dropdownList = new List<SimpleDataBean>();\r
-                \r
-                foreach (CategoryData categList in allList)\r
+                if (data.Category == null)\r
                 {\r
-                    dropdownList.Add(categList.dataForDropDown);\r
-                }\r
-                string wkStr = form.showDropBoxInputBox(dropdownList,"カテゴリを入力してください。");\r
+                    CategoryDataAccessor dataAccessor = CategoryDataAccessor.getObject;\r
+                    //string wkStr = form.showInputBox("カテゴリを記入してください。");\r
+                    List<CategoryData> allList = dataAccessor.getAllCategory();\r
+                    List<SimpleDataBean> dropdownList = new List<SimpleDataBean>();\r
+                    bool wkIsOK;\r
 \r
-                if (wkStr == null)\r
-                {\r
-                    message = "処理を中断しました。";\r
-                    return false;\r
-                }\r
+                    foreach (CategoryData categList in allList)\r
+                    {\r
+                        dropdownList.Add(categList.dataForDropDown);\r
+                    }\r
+                    string wkStr = form.showDropBoxInputBox(dropdownList, "カテゴリを入力してください。", out wkIsOK);\r
 \r
-                CategoryData categData = dataAccessor.getCategoryFromName(wkStr);\r
-                if (categData != null)\r
-                {\r
-                    data.CategID = categData.CategId;\r
+                    if (!wkIsOK)\r
+                    {\r
+                        message = "処理を中断しました。";\r
+                        return false;\r
+                    }\r
+                    if (string.IsNullOrEmpty(wkStr))\r
+                    {\r
+                        message = "処理を中断しました。";\r
+                        return false;\r
+                    }\r
+\r
+                    CategoryData categData = dataAccessor.getCategoryFromName(wkStr);\r
+                    if (categData != null)\r
+                    {\r
+                        data.CategID = categData.CategId;\r
+                    }\r
+                    else\r
+                    {\r
+                        data.CategID = 0;\r
+                    }\r
                 }\r
                 else\r
                 {\r
-                    data.CategID = 0;\r
+                    data.CategID = addArgs.CategoryID;\r
                 }\r
             }\r
-            else\r
-            {\r
-                data.CategID = addArgs.CategoryID;\r
-            }\r
             if (data.ForecastMin == 0)\r
             {\r
                 string wkFrcstMin = form.showInputBox("見積時間を分単位で入力してください。","0");\r
@@ -123,12 +133,35 @@ namespace com.andoutomo.kybernetes.command
                 {\r
                     data.ForecastMin = Convert.ToInt32(wkFrcstMin);                    \r
                 }\r
-\r
-\r
+            }\r
+            if (data.Project == null)\r
+            {\r
+                bool wkIsOK;\r
+                string wkProject = null;\r
+                List<SimpleDataBean> beanList = taskAccessor.getProjectList();\r
+                wkProject = form.showDropBoxInputBox(beanList, "プロジェクトを入力してください。",out wkIsOK);\r
+                if (!wkIsOK)\r
+                {\r
+                    message = "処理を中断しました。";\r
+                    return false;\r
+                }\r
+                data.Project = wkProject;\r
+            }\r
+            if (data.Tags == null)\r
+            {\r
+                bool wkIsOK;\r
+                string wkTag = null;\r
+                List<SimpleDataBean> beanList = taskAccessor.getTagList();\r
+                wkTag = form.showDropBoxInputBox(beanList, "タグを入力してください。",out wkIsOK);\r
+                if (!wkIsOK)\r
+                {\r
+                    message = "処理を中断しました。";\r
+                    return false;\r
+                }\r
+                data.Tags = wkTag;\r
             }\r
 \r
             //DBへの追加\r
-            TaskDataAccessor taskAccessor = TaskDataAccessor.getObject;\r
             data.TaskID = taskAccessor.getMaxTaskID();\r
             if (data.SortID == 0)\r
             {\r