Refactored Chaos Calendar by wrapping libical and introducing event and occurrence model. More improvements to come. Enables us to create events with reoccurrence and intervals etc.

4 files changed, 119 insertions, 0 deletions

diff --git a/app/views/occurrences/edit.html.erb b/app/views/occurrences/edit.html.erb
new file mode 100644
index 0000000..6a81188
--- /dev/null
+++ b/app/views/occurrences/edit.html.erb
@@ -0,0 +1,32 @@
+<h1>Editing occurrence</h1>
+
+<% form_for(@occurrence) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :summary %><br />
+    <%= f.text_field :summary %>
+  </p>
+  <p>
+    <%= f.label :start_time %><br />
+    <%= f.datetime_select :start_time %>
+  </p>
+  <p>
+    <%= f.label :end_time %><br />
+    <%= f.datetime_select :end_time %>
+  </p>
+  <p>
+    <%= f.label :node_id %><br />
+    <%= f.text_field :node_id %>
+  </p>
+  <p>
+    <%= f.label :event_id %><br />
+    <%= f.text_field :event_id %>
+  </p>
+  <p>
+    <%= f.submit 'Update' %>
+  </p>
+<% end %>
+
+<%= link_to 'Show', @occurrence %> |
+<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
diff --git a/app/views/occurrences/index.html.erb b/app/views/occurrences/index.html.erb
new file mode 100644
index 0000000..06dbf07
--- /dev/null
+++ b/app/views/occurrences/index.html.erb
@@ -0,0 +1,28 @@
+<h1>Listing occurrences</h1>
+
+<table>
+  <tr>
+    <th>Summary</th>
+    <th>Start time</th>
+    <th>End time</th>
+    <th>Node</th>
+    <th>Event</th>
+  </tr>
+
+<% @occurrences.each do |occurrence| %>
+  <tr>
+    <td><%=h occurrence.summary %></td>
+    <td><%=h occurrence.start_time %></td>
+    <td><%=h occurrence.end_time %></td>
+    <td><%=h occurrence.node_id %></td>
+    <td><%=h occurrence.event_id %></td>
+    <td><%= link_to 'Show', occurrence %></td>
+    <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td>
+    <td><%= link_to 'Destroy', occurrence, :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New occurrence', new_occurrence_path %>
\ No newline at end of file
diff --git a/app/views/occurrences/new.html.erb b/app/views/occurrences/new.html.erb
new file mode 100644
index 0000000..0a77af1
--- /dev/null
+++ b/app/views/occurrences/new.html.erb
@@ -0,0 +1,31 @@
+<h1>New occurrence</h1>
+
+<% form_for(@occurrence) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :summary %><br />
+    <%= f.text_field :summary %>
+  </p>
+  <p>
+    <%= f.label :start_time %><br />
+    <%= f.datetime_select :start_time %>
+  </p>
+  <p>
+    <%= f.label :end_time %><br />
+    <%= f.datetime_select :end_time %>
+  </p>
+  <p>
+    <%= f.label :node_id %><br />
+    <%= f.text_field :node_id %>
+  </p>
+  <p>
+    <%= f.label :event_id %><br />
+    <%= f.text_field :event_id %>
+  </p>
+  <p>
+    <%= f.submit 'Create' %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', occurrences_path %>
\ No newline at end of file
diff --git a/app/views/occurrences/show.html.erb b/app/views/occurrences/show.html.erb
new file mode 100644
index 0000000..9e831cf
--- /dev/null
+++ b/app/views/occurrences/show.html.erb
@@ -0,0 +1,28 @@
+<p>
+  <b>Summary:</b>
+  <%=h @occurrence.summary %>
+</p>
+
+<p>
+  <b>Start time:</b>
+  <%=h @occurrence.start_time %>
+</p>
+
+<p>
+  <b>End time:</b>
+  <%=h @occurrence.end_time %>
+</p>
+
+<p>
+  <b>Node:</b>
+  <%=h @occurrence.node_id %>
+</p>
+
+<p>
+  <b>Event:</b>
+  <%=h @occurrence.event_id %>
+</p>
+
+
+<%= link_to 'Edit', edit_occurrence_path(@occurrence) %> |
+<%= link_to 'Back', occurrences_path %>
\ No newline at end of file