polyrex-calendar 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee67cdc9cf7e8ef17a88e97a1aff15b99ad56ad
-  data.tar.gz: 00e56cf7bc853849f8a0d8e308d927c327450d29
+  metadata.gz: a0551aea7879043e0a3e8caf6d166519d3492103
+  data.tar.gz: 638adedfaefbe0848546464cc2446be27e5637f5
 SHA512:
-  metadata.gz: 840501bd85c72c56d571d5c85829f1c8f36997047489f9c968384105fdc38e349777dce4fe4102d055722933d0d492ffa4a7fb5fed6998b8cdf5a2297d3f6dae
-  data.tar.gz: c054c3879133dd8079cae13fc3bb69ad3737613d511e095a6aba203629dbbf773388a88f7d01200584b8cf42d496ab0fd018d835e7eda7ae9db49e0130ee1b4b
+  metadata.gz: 42dede41e97bf3bedb1a66fc75ed3b31f16d38d168c5ddd3fec0818ab1a6895b0a366593c536cdcc150affc2c11907ada8017639876c47e653ef7ac3c72e78ca
+  data.tar.gz: 243758ab6490f564138222d1e15e2cc25c2eadba858f9d4c02c720efcf8709c59c93bffcb8a818537fbfdf6bf2208bede68326c151a4910e7fef9c6fa5f0527c

data/lib/layout.css

@@ -6,7 +6,7 @@ body {background-color: transparent }
   margin-bottom: 0.6em;
   overflow: hidden;
   padding-bottom: 0.5em;
-  width: 690px;   
+  width: 680px;   
 }
 
   #wrap h1 {
@@ -18,7 +18,7 @@ body {background-color: transparent }
   #wrap>div:first-child {
     background-color: #458;
     float:left;
-    width:405px;
+    width:400px;
   }
 
   #wrap>div:first-child>div {
@@ -31,7 +31,8 @@ body {background-color: transparent }
 
     #wrap table {
       background-color: transparent; 
-
+      font-family: Helvetica, Verdana, Serif;
+      font-size: 0.7em;
     }
       #wrap table td {text-align: center}
 
@@ -46,6 +47,7 @@ body {background-color: transparent }
   #wrap>div:nth-child(2) {
     background-color: #444;
     float: left;
+    width: 250px;
     page-break-after: always;
 
   }

data/lib/month.css

@@ -2,6 +2,25 @@
   background-color: rgba(180, 180, 150, 0.1);
 }
 
+#wrap>header {
+  background-color: transparent;
+}
+
+  #wrap>header>nav:first-child>ul{
+    background-color: transparent;
+    list-style-type: none;
+  }
+    #wrap>header>nav:first-child>ul>li {
+      background-color: transparent;
+      display: inline;
+    }
+
+    #wrap>header>nav:first-child>ul>li~li:before {
+      background-color: transparent;
+      content: "> ";
+    }
+
+
 #wrap>h1{
   background-color: transparent;
   color: rgba(80, 80, 50, 0.8);

data/lib/month_layout.css

@@ -3,13 +3,23 @@ body {background-color: transparent }
 #wrap {
   background-color: transparent; 
   margin: 0 auto;
-  width: 1000px;   
+  width: 970px;   
 }
 
+  #wrap header>nav {
+    background-color: #aba;
+    float: left; 
+  }
+
+  #wrap header>nav+nav {
+    background-color: #a98;
+    float: right; 
+  }
   #wrap h1 {
     background-color: transparent; 
     margin: 0.5em 0.3em; 
     padding: 0.2em 0.2em;
+    clear: both
   }
 
     #wrap table {background-color: transparent; }

data/lib/monthday.css

@@ -0,0 +1,94 @@
+body {
+  background-color: #39a;
+  margin: 0em; 0.1em padding: 0em 0.1em;
+}
+#wrap {
+  background-color: #49b;
+  border: none;
+  font-family: helvetica, verdana, sans;
+  margin: 0em 0.1em; padding: 0em 0.1em;
+}
+  #wrap header{
+    background-color: #99b;
+    overflow: hidden
+    margin: 0em; 0.1em padding: 0em 0.1em;
+  }
+
+  #wrap>header>nav:first-child>ul{
+    background-color: transparent;
+    list-style-type: none;
+  }
+    #wrap>header>nav:first-child>ul>li {
+      background-color: transparent;
+      display: inline;
+    }
+
+    #wrap>header>nav:first-child>ul>li~li:before {
+      background-color: transparent;
+      content: "> ";
+    }
+
+  #wrap header>h1{
+    background-color: transparent;
+    color: rgba(180,180,180, 0.8);
+    font-size: 2.3em;
+    margin: 0em; 0.1em padding: 0em 0.1em;
+  }
+  #wrap header>h2{
+    background-color: transparent;
+    color: #fff;
+    font-size: 2.3em;
+    margin: 0em; 0.1em padding: 0em 0.1em;
+  }
+  #wrap>ul>li>div{
+
+    background-color: #341;
+    float:left;
+  }
+  #wrap>ul>li>div:first-child{
+    background-color: rgba(50, 50, 50, 0.4);
+    color: #fff;
+    font-size: 1.7em;
+    margin-top: 0.1em;
+    padding: 0.2em 0.1em 0.2em 0.1em;
+    text-align: right;
+    width: 1.1em;
+  }
+  #wrap>ul>li>div:nth-child(2){
+    background-color: transparent;
+    color: rgba(50, 50, 50, 0.8);
+    font-size: 1.3em;
+    margin: 0.2em 0.2em;
+    padding: 0.4em 0.3em 0.3em 0.3em;
+    width: 2.4em;
+
+  }
+  #wrap>ul>li>div:nth-child(3){
+    background-color: transparent;
+    color: #000;
+    float: right;
+    font-size: 0.65em;
+    margin: 3.4em 0.0em 0.1em 0.2em;
+    padding: 0.1em 0.2em;
+
+  }
+
+  #wrap>ul>li>div:nth-child(3)>span{
+    background-color: transparent;
+    font-weight: 700;
+  }
+  #wrap>ul {
+    background-color: rgba(250,230,230, 0.5);
+    list-style-type: none;
+    margin:0.1em 0.2em; padding: 0.1em 0.2em;
+    page-break-after: always;
+  }
+
+    #wrap>ul>li {
+      background-color: transparent;
+      border-bottom: 1px solid black;
+      margin:0em 0em; padding: 0.1em;
+      display: inline-block;
+      height: 3.15em;
+      width: 19em;
+    }

data/lib/monthday_layout.css

@@ -0,0 +1,29 @@
+body {
+  background-color: #39a;
+  margin: 0.1em;
+  padding: 0.2em;
+}
+#wrap {
+  background-color: #49b;
+  border: 1px solid black;
+  width: 640px;
+}
+#wrap header{
+  background-color: #99b;
+  height: 3.5em;
+}
+  #wrap header>h1{
+    background-color: #abb;
+    float: right;
+  }
+  #wrap header>h2{
+    background-color: #ccb;
+    float: left;
+  }
+
+#wrap>ul {
+  background-color: #acc;
+  -moz-column-count: 2; -moz-column-gap: 1em; -moz-column-rule: 1px solid black; 
+  -webkit-column-count: 2; -webkit-column-gap: 1em; -webkit-column-rule: 1px solid black;
+  margin:0.2em 0.5em; padding: 0.3em;
+}

data/lib/polyrex-calendar.rb

@@ -15,7 +15,7 @@ MONTH = DAY * 30
 h = {
   calendar: 'calendar[year]',
      month: 'month[n, title]',
-      week: 'week[n]',
+      week: 'week[n, mon, no, label]',
        day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
      entry: 'entry[time_start, time_end, duration, title]'
 }
@@ -126,7 +126,7 @@ class PolyrexObjects::Week
     # add a css selector for the current day
     date = Time.now.strftime("%Y-%b-%d")
     doc = Rexle.new self.to_xml
-    e = doc.root.element("records/day/summary[date='#{date}']")
+    e = doc.root.element("records/day/summary[sdate='#{date}']")
 
     e.add Rexle::Element.new('css_style').add_text('selected')
 
@@ -169,7 +169,7 @@ class PolyrexCalendar
            day: 'day[sdate, xday, event, bankholiday, title, sunrise, sunset]',
          entry: 'entry[time_start, time_end, duration, title]'
     }
-    schema = %i(calendar month day entry).map{|x| h[x]}.join '/'
+    @schema = %i(calendar month day entry).map{|x| h[x]}.join '/'
 
 
     if calendar_file then
@@ -182,14 +182,14 @@ class PolyrexCalendar
 
       a = (Date.parse(@year + '-01-01')...Date.parse(@year.succ + '-01-01')).to_a
 
-      @polyrex = Polyrex.new(schema, id_counter: @id)
+      @polyrex = Polyrex.new(@schema, id_counter: @id)
       @polyrex.summary.year = @year
 
       a.group_by(&:month).each do |month, days| 
 
         @polyrex.create.month no: month.to_s, title: Date::MONTHNAMES[month]  do |create|
           days.each do |x|
-            create.day sdate: x.strftime("%Y-%b-%d"), xday: x.day.to_s
+            create.day sdate: x.strftime("%Y-%b-%d"), xday: x.day.to_s, title: Date::DAYNAMES[x.wday]
           end
         end
       end
@@ -226,14 +226,15 @@ class PolyrexCalendar
 
   def kitchen_planner()
 
-    px = Polyrex.new(@schema, id_counter: @id)
-    px.summary.year = @year
-    (1..12).each {|n| px.add self.month(n, moday_week: true) }
+    #px = Polyrex.new(@schema, id_counter: @id)
+    #px.summary.year = @year
+    #(1..12).each {|n| px.add self.month(n, monday_week: true) }
+    px = @polyrex
 
     px.xslt = 'kplanner.xsl'
     px.css_layout = 'monthday_layout.css'
     px.css_style = 'monthday.css'
-    px.filename = summary.year.to_s + '-kitchen-planner.html'
+    px.filename = @year + '-kitchen-planner.html'
 
     px
     
@@ -243,7 +244,7 @@ class PolyrexCalendar
 
     px = Polyrex.new(@schema, id_counter: @id)
     px.summary.year = @year
-    (1..12).each {|n| px.add self.month(n, strict: true) }
+    (1..12).each {|n| px.add self.month(n, monday_week: true) }
 
     px.xslt = 'calendar.xsl'
     px.css_layout = 'layout.css'
@@ -312,6 +313,8 @@ class PolyrexCalendar
     end
 
   end
+  def month_day()
+  end
 
   def months
     @polyrex.records
@@ -339,31 +342,17 @@ class PolyrexCalendar
   
   def this_week()
 
-    m = DateTime.now.month
-    thisweek = self.month(m).records.find do |week|
-
-      now = DateTime.now
-      #week_no = now.cwday < 7 ? now.cweek - 1: now.cweek
-      week_no = now.cweek
-      week.no == week_no.to_s
-    end
-
-    day = (Time.now - DAY * (Time.now.wday - 1)).day
-
-    days_in_week = self.this_month.xpath('records/week/records/.')\
-      .select {|x| x.text('summary/xday').to_i >= day}\
-      .take 7
-
-    doc_week = Rexle.new thisweek.to_xml
-    records = doc_week.root.element 'records'
-    records.insert_before Rexle::Element.new('records')
-
-    records.delete
+    dt = DateTime.now
+    days = @polyrex.records[dt.month-1].day
 
-    week = doc_week.root.element 'records'
-    days_in_week.each {|day| week.add day }
-    PolyrexObjects::Week.new doc_week.root
+    r = days.find {|day| day.date.cweek == dt.cweek }    
+    pxweek = PolyrexObjects::Week.new
+    pxweek.mon = Date::MONTHNAMES[dt.month]
+    pxweek.no = dt.cweek.to_s
+    pxweek.label = ''
+    days[days.index(r),7].each{|day| pxweek.add day }
 
+    pxweek
   end
 
   def this_month()

data/lib/year.css

@@ -0,0 +1,63 @@
+#wrap {
+  background-color: #d93; 
+  margin: 0;
+  margin-bottom: 0.6em;
+  overflow: hidden;
+  padding-bottom: 0.5em;
+/*  width: 900px;   */
+}
+
+  #wrap h1 {
+    background-color: transparent; 
+    font-family: Helvetica, Verdana;
+    font-size: 1.1em;
+    margin: 0.5em; 
+    padding: 0.2em 0.4em;
+  }
+
+  #wrap>div>header>nav:first-child>ul{
+    background-color: transparent;
+    list-style-type: none;
+  }
+    #wrap>div>header>nav:first-child>ul>li {
+      background-color: transparent;
+      display: inline;
+    }
+
+    #wrap>div>header>nav:first-child>ul>li~li:before {
+      background-color: transparent;
+      content: "> ";
+    }
+
+
+    #wrap>div:nth-child(2) {
+      background-color: #777;
+      padding: 0.3em;
+      margin: 0.1em;
+    }
+    #wrap>div>ul {
+      background-color: #777;
+      list-style-type: none;  
+      padding: 0.3em;
+      margin: 0.1em;
+    }
+
+      #wrap>div:nth-child(2)>ul>li, #wrap>div:last-child>ul>li {
+        background-color: #aaa;  
+        padding: 0.3em;
+        margin: 0.1em;
+      }
+
+      #wrap>div:nth-child(2)>ul>li>span, #wrap>div:last-child>ul>li>span {
+        background-color: #9ab;  
+        display: block; float: left; width: 4.4em;
+       
+      }
+
+      #wrap>div:last-child {
+        background-color: #acc;
+        clear: both;
+        -moz-column-count: 2; -moz-column-gap: 1em; -moz-column-rule: 1px solid black; -webkit-column-count: 2; -webkit-column-gap: 1em; -webkit-column-rule: 1px solid black;
+        margin:0.1em 0.3em; 
+        padding: 0.3em;
+      }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   CIpMEIXEnQwmcmWL07xvpUquKTab0tCXtmcfjr74KP2KCm5guZyxeXaj9lD1OrnC
   Kgt/mRI2beG8K7QY81GGMsQjiG95Dcko
   -----END CERTIFICATE-----
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -106,6 +106,7 @@ files:
 - lib/calendar.xsl~
 - lib/kplanner.xsl
 - lib/monthday.css
+- lib/year.css
 - lib/month_layout.css
 - lib/month.css
 homepage: https://github.com/jrobertson/polyrex-calendar

metadata.gz.sig

@@ -1,2 +1 @@
-,jK���?�/�a�~�WzR�>�4Iy����ɚgx���ok�]}j�­�O�2סKS�t����!#1gT�؏�֎�c#�cL�VQ���������$
-���C|.-f��ȯ	�—X
!ꐧ	�L���m͵|�f;��	����dj�8��S7��dv�8��jq;r�Z窀E]��^o��':z׹�4EK1T���M��M�
+�x�	�j�V�b��ժ �\��55�Z�I~��L�a\Ѻ[�82I�r'=&���-����8!=�>�:X��dko�s�AD3