X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=main%2Fcommand%2FCRUD%2FAddCommand.cs;h=f6590f3e3c112562ebd0d9ba1a786f598dfa0855;hb=980eaac71fbd2830eee96dbcd6ad2281afd4f970;hp=15a174b6821a224a399bb80d87571c3c2b980318;hpb=5b92bddb0ef222587ab4304562fa26d1f58b5b9c;p=kybernetes%2FKybernetes.git

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