Changeset 14667

Timestamp:

06/26/08 23:32:50 (5 years ago)

Author:

coma2n

Message:

platform/silverlight/eLearn/trunk: study追加機能を実装

Location:

platform/silverlight/eLearn/trunk

Files:

• eLearn/Page.xaml (modified) (2 diffs)
• eLearn/Page.xaml.cs (modified) (1 diff)
• eLearn/UI/AddStudyView.xaml (added)
• eLearn/UI/AddStudyView.xaml.cs (added)
• eLearn/UI/QuestionView.xaml (modified) (2 diffs)
• eLearn/eLearn.csproj (modified) (2 diffs)
• eLearn_Web/Content/Site.css (modified) (1 diff)
• eLearn_Web/Controllers/StudyController.cs (modified) (4 diffs)
• eLearn_Web/Views/Shared/Site.Master (modified) (1 diff)
• eLearn_Web/eLearn_Web.csproj.user (modified) (1 diff)

platform/silverlight/eLearn/trunk/eLearn/Page.xaml

@@ -1 +1 @@
 <UserControl x:Class="eLearn.Page"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:v="clr-namespace:eLearn.UI"
     Width="400" Height="220">
     
@@ -30 +31 @@
                 
                 <StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="8,0,0,0">
-                        <Button x:Name="addButton" Width="80" Content="追加" Style="{StaticResource button}" />
+                        <Button x:Name="addButton" Width="80" Content="追加"
+                    Click="addButton_Click" Style="{StaticResource button}" />
+            
                         <Button x:Name="editButton" Width="80" Content="編集" IsEnabled="False" Margin="0,5,0,0" Style="{StaticResource button}" />
                         <Button x:Name="remButton" Width="80" Content="削除" IsEnabled="False" Margin="0,5,0,0" Style="{StaticResource button}" />
                 </StackPanel>
+        
+        <v:AddStudyView x:Name="addStudyView" Grid.ColumnSpan="2" Visibility="Collapsed" />
     </Grid>
         

platform/silverlight/eLearn/trunk/eLearn/Page.xaml.cs

@@ -91 +91 @@
         }
 
+        /// <summary>
+        /// [追加]
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void addButton_Click(object sender, RoutedEventArgs e) {
+            addStudyView.Show();
+        }
+
     }
 }

platform/silverlight/eLearn/trunk/eLearn/UI/QuestionView.xaml

@@ -3 +3 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:data="clr-namespace:eLearn.UI.Data"
-        Width="360" Height="300">
+        Width="360" Height="290">
     
     <UserControl.Resources>
@@ -71 +71 @@
     <Grid x:Name="LayoutRoot" Background="White">
                 <Grid.RowDefinitions>
-                        <RowDefinition Height="70" />
+                        <RowDefinition Height="60" />
                         <RowDefinition />
                         <RowDefinition Height="40" />

platform/silverlight/eLearn/trunk/eLearn/eLearn.csproj

@@ -73 +73 @@
     <Compile Include="StudyManager.cs" />
     <Compile Include="StudyResult.cs" />
+    <Compile Include="UI\AddStudyView.xaml.cs">
+      <DependentUpon>AddStudyView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UI\Data\QuestionConverter.cs" />
     <Compile Include="UI\FinishView.xaml.cs">
@@ -93 +96 @@
       <Generator>MSBuild:MarkupCompilePass1</Generator>
       <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\AddStudyView.xaml">
+      <SubType>Page</SubType>
+      <Generator>MSBuild:MarkupCompilePass1</Generator>
     </Page>
     <Page Include="UI\FinishView.xaml">

platform/silverlight/eLearn/trunk/eLearn_Web/Content/Site.css

@@ -1 +1 @@
 
 .page {
+        width: 400px;
 }
 
 .silverlight {
     width: 400px;
-    height: 400px;
+    height: 330px;
 }
 
 #header {
-    height: 55px;
+    margin-bottom: 20px;
 }

platform/silverlight/eLearn/trunk/eLearn_Web/Controllers/StudyController.cs

@@ -27 +27 @@
 using System.Web;
 using System.Web.Mvc;
+using System.Net;
+using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 using System.Diagnostics;
+
+using Ele = System.Xml.Linq.XElement;
+using Attr = System.Xml.Linq.XAttribute;
 
 #endregion
@@ -41 +46 @@
     /// </summary>
     public sealed class StudyController : Controller {
-        
+
+        #region const
+
+        /// <summary>
+        /// インデックスファイル
+        /// </summary>
+        private const string INDEX_FILE = "~/App_Data/Repo/index.xml";
+        /// <summary>
+        /// コンテントファイルのフォーマット
+        /// </summary>
+        private const string CONTENT_FILE_FORMAT = "~/App_Data/Repo/study/{0}.xml";
+
+        #endregion
+
         #region constructors
 
@@ -59 +77 @@
         /// <returns>スタディ情報の一覧</returns>
         public ActionResult Index() {
-            var path = Request.MapPath("~/App_Data/Repo/index.xml");
+            var path = Request.MapPath(INDEX_FILE);
 
             using(var sr = new StreamReader(path, Encoding.UTF8)) {
-                return Content(sr.ReadToEnd(), "text/xml", Encoding.UTF8);
+                return Content(sr.ReadToEnd(), "text/xml");
             }
         }
@@ -74 +92 @@
             if(id != null) {
                 try {
-                    var path = Request.MapPath(string.Format("~/App_Data/Repo/study/{0}.xml", id));
+                    var path = Request.MapPath(string.Format(CONTENT_FILE_FORMAT, id));
 
                     using(var sr = new StreamReader(path, Encoding.UTF8)) {
-                        return Content(sr.ReadToEnd(), "text/xml", Encoding.UTF8);
+                        return Content(sr.ReadToEnd(), "text/xml");
                     }
 
                 } catch(Exception exp) {
-                    throw new HttpException(404, "指定したスタディは存在しません", exp);
+                    throw new HttpException((int)HttpStatusCode.NotFound, "指定したStudyは存在しません。", exp);
                 }
 
             } else {
-                throw new HttpException(400, "idを指定して下さい");
-            }
-        }
+                throw new HttpException((int)HttpStatusCode.BadRequest, "[id]を指定して下さい。");
+            }
+        }
+
+        /// <summary>
+        /// スタディを新規作成します。
+        /// </summary>
+        /// <param name="title">タイトル</param>
+        /// <returns>スタディ情報</returns>
+        public ActionResult New(string title) {
+            if(string.IsNullOrEmpty(title)) {
+                throw new HttpException((int)HttpStatusCode.BadRequest, "[title]を指定して下さい。");
+            }
+            var indexXml = OpenIndex();
+            var id = indexXml.Descendants("study").Max(s => (int)s.Attribute("id")) + 1;
+
+            indexXml.Root.Add(
+                new Ele("study",
+                    new Attr("id", id), new Attr("title", title)
+                )
+            );
+            SaveIndex(indexXml);
+
+            var contentXml = new XDocument(
+                new Ele("study",
+                    new Attr("id", id), new Attr("title", title)
+                )
+            );
+            return Content(
+                SaveContent(contentXml, id).ToString(), "text/xml"
+            );
+        }
+
+        /// <summary>
+        /// 指定したIdのスタディを削除します。
+        /// </summary>
+        /// <param name="id">Id</param>
+        /// <returns>削除できたかどうか</returns>
+        public ActionResult Remove(int? id) {
+            if(id == null) {
+                throw new HttpException((int)HttpStatusCode.BadRequest, "[id]を指定して下さい。");
+            }
+            var indexXml = OpenIndex();
+
+            var study = indexXml.Descendants("study")
+                .FirstOrDefault(s => (int)s.Attribute("id") == id.Value);
+
+            if(study == null) {
+                throw new HttpException((int)HttpStatusCode.NotFound, "指定したStudyは存在しません。");
+            }
+            study.Remove();
+
+            SaveIndex(indexXml);
+
+            return Content("0", "text/plain");
+        }
+
+        /// <summary>
+        /// 指定したIdのスタディに指定した質問を追加します。
+        /// </summary>
+        /// <param name="id">Id</param>
+        /// <param name="content">質問内容を表すXML</param>
+        /// <returns>スタディ情報</returns>
+        public ActionResult AddQuestion(int? id, string content) {
+            if(id == null || string.IsNullOrEmpty(content)) {
+                throw new HttpException((int)HttpStatusCode.BadRequest, "[id][content]を指定して下さい。");
+            }
+            var xml = OpenContent(id);
+            xml.Root.Add(content);
+
+            return Content(
+                SaveContent(xml, id).ToString(), "text/xml"
+            );
+        }
+
+        /// <summary>
+        /// 指定したIdのスタディの指定した位置の質問を削除します。
+        /// </summary>
+        /// <param name="id">Id</param>
+        /// <param name="index">質問の位置</param>
+        /// <returns>削除後のスタディ情報</returns>
+        public ActionResult RemoveQuestion(int? id, int? index) {
+            if(id == null || index == null) {
+                throw new HttpException((int)HttpStatusCode.BadRequest, "[id][index]を指定して下さい。");
+            }
+            var contentXml = OpenContent(id);
+            // 一度リストに変換しないと駄目よ！！
+            contentXml.Descendants("question")
+                .Where((q, i) => i == index)
+                .ToList().ForEach(q => q.Remove());
+            
+            return Content(
+                SaveContent(contentXml, id).ToString(), "text/xml"
+            );
+        }
+
+        #region private
+
+        /// <summary>
+        /// インデックスファイルを開きます。
+        /// </summary>
+        /// <returns>インデックスファイル</returns>
+        XDocument OpenIndex() {
+            return XDocument.Load(Request.MapPath(INDEX_FILE));
+        }
+
+        /// <summary>
+        /// 指定したインデックスを保存します。
+        /// </summary>
+        /// <param name="xml">インデックス</param>
+        /// <returns>インデックス</returns>
+        XDocument SaveIndex(XDocument xml) {
+            xml.Save(Request.MapPath(INDEX_FILE));
+
+            return xml;
+        }
+
+        /// <summary>
+        /// 指定したIdのコンテントを開きます。
+        /// </summary>
+        /// <param name="id">Id</param>
+        /// <returns>コンテント</returns>
+        XDocument OpenContent(int? id) {
+            return XDocument.Load(
+                Request.MapPath(string.Format(CONTENT_FILE_FORMAT, id))
+            );
+        }
+
+        /// <summary>
+        /// 指定したコンテントを保存します。
+        /// </summary>
+        /// <param name="xml">コンテント</param>
+        /// <param name="id">Id</param>
+        /// <returns>コンテント</returns>
+        XDocument SaveContent(XDocument xml, int? id) {
+            xml.Save(
+                Request.MapPath(string.Format(CONTENT_FILE_FORMAT, id))
+            );
+            return xml;
+        }
+
+        #endregion
 
         #endregion

platform/silverlight/eLearn/trunk/eLearn_Web/Views/Shared/Site.Master

@@ -10 +10 @@
 
 <body>
-    <div id="header">
-        <a href="../Home/Index.aspx"><img src="../Content/logo.png" border="0" /></a>
-    </div>
-    <div class="page">
-        <asp:ContentPlaceHolder ID="MainContent" runat="server" />
-    </div>
+    <table border="0" cellspacing="0" cellpadding="0" width="100%">
+        <tr><td align="center">
+            <table>
+                <tr><td align="left" class="page">
+                    <div id="header">
+                        <a href="../Home/Index.aspx"><img src="../Content/logo.png" border="0" /></a>
+                    </div>
+                    
+                    <asp:ContentPlaceHolder ID="MainContent" runat="server" />
+                </td></tr>
+            </table>
+        </td></tr>
+    </table>
 </body>
 </html>

platform/silverlight/eLearn/trunk/eLearn_Web/eLearn_Web.csproj.user

@@ -1 +1 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>