From 71f395243d5cb7e2de918908f5c80b4ece37f58f Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Wed, 24 Aug 2011 12:26:56 +0100
Subject: Added XMPP interface.  Fixes #1301 Also tidied calendar a bit

---
 lib/mauve/web_interface.rb | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

(limited to 'lib/mauve/web_interface.rb')

diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb
index 386dfac..fdf2ddb 100644
--- a/lib/mauve/web_interface.rb
+++ b/lib/mauve/web_interface.rb
@@ -193,7 +193,7 @@ EOF
       # ack_until is in milliseconds!
       ack_until  = params[:ack_until]
       n_hours    = params[:n_hours]    || 2
-      type_hours = params[:type_hours] || "daylight"
+      type_hours = params[:type_hours] || "daytime"
       alerts     = params[:alerts]     || []
       note       = params[:note]       || nil
 
@@ -327,6 +327,7 @@ EOF
     get '/alert/:id' do
       find_active_alerts
       @alert = Alert.get!(params['id'])
+
       haml :alert
     end
     
@@ -395,10 +396,16 @@ EOF
     
     ########################################################################
    
- 
-
     get '/events/alert/:id' do
+      query = {:alert => {}, :history => {}}
+      query[:alert][:id] = params[:id]
+
+      query[:history][:type] = ["update", "notification"]
+
+      @alert  = Alert.get!(params['id'])
+      @events = find_events(query)
 
+      haml :events_list
     end
 
     get '/events/calendar' do
@@ -465,16 +472,37 @@ EOF
 
     get '/events/list/:start' do
       if params[:start] =~ /\A(\d{4,4})-(\d{1,2})-(\d{1,2})\Z/
-        @start = Time.local($1.to_i,$2.to_i,$3.to_i,0,0,0,0)
+        start = Time.local($1.to_i,$2.to_i,$3.to_i,0,0,0,0)
       else
         t = Time.now
+        start = Time.local(t.year, t.month, t.day, 0,0,0,0)
+      end
+
+      finish = start + 1.day + 1.hour
+
+      redirect "/events/list/#{start.strftime("%Y-%m-%d")}/#{finish.strftime("%Y-%m-%d")}"
+    end
+    
+    get '/events/list/:start/:finish' do
+
+      t = Time.now
+      if params[:start] =~ /\A(\d{4,4})-(\d{1,2})-(\d{1,2})\Z/
+        @start = Time.local($1.to_i,$2.to_i,$3.to_i,0,0,0,0)
+      else
         @start = Time.local(t.year, t.month, t.day, 0,0,0,0)
       end
       
+      if params[:finish] =~ /\A(\d{4,4})-(\d{1,2})-(\d{1,2})\Z/
+        finish = Time.local($1.to_i,$2.to_i,$3.to_i,0,0,0,0)
+      else
+        t += 1.day + 1.hour
+        finish = Time.local(t.year, t.month, t.day, 0,0,0,0)
+      end
+
       query = {:history => {}}
       query[:history][:created_at.gte] = @start
-      query[:history][:created_at.lt]  = @start + 1.day
-
+      query[:history][:created_at.lt]  = finish
+      
       @events = find_events(query)
 
       haml :events_list
-- 
cgit v1.2.1