polyrex-calendar 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b7f2adb9120d8bb6f30118816a105abb7321d5
-  data.tar.gz: 7d8db19931ccce31286d9d10962e75bf26f77554
+  metadata.gz: 73a4ea12f8ea4b5072eb3bc43b38d53023a57cbf
+  data.tar.gz: e6b7d20a0696d322cb5f55a9b7cfd4123b404d2b
 SHA512:
-  metadata.gz: f7f017e63343dce72c18ba5d7cc7f82c334f9e0eb6d155a3a037ab944c749fb7010d7fb35540ef99a0836a4a57871488e3802267ee6429f66b88335b2fc29597
-  data.tar.gz: 971706fa487574ebb81cff54bff62750bf880cc95ebb412b000dfd191cfd3f70254d645682b5817606e84c7a805573afe674f21c353ff9d072e7adb5b92a88f1
+  metadata.gz: 59ab20f5c5150fb7fdb381f7a86fe133346c544d93461a0e3b5ddfe1e3486b893eed51672918d75d3184d0fdc290f00e097fd7deaf9b4c3263a1088ef01bf4ff
+  data.tar.gz: c6ea19082bb2f13d40946c6c07a569f4d6c0a6883eb76a0d4059f14dbb2555440d304f6f6d8fedb8fd2dc792f623a7e2a457c7b83f596983009ba5a2a7a31b44

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-~������ە���u
;���֟����p�u��J�RLM�6
-Rv�W�f/ƺwU�6��R�E;�|Zc�+��R����-K�<f���諐k-�B���9-RR
+����~�{M5���� "9�u���AYo�-fe��J���;#]���9�l*�0j1/�S��%=!1��;���ĥ'��]T�ù�~��<�`����썕{(
�z��>��<��k���#LbZU���T�/����=���>��R����D@��O�xg꤮���D��ZN?gŅ�OU������z0:W��x�J�AO\�����:C&�����s��L� �.�������
`Z�Y^���rSF���\-tٚ

data.tar.gz.sig

@@ -1 +1 @@
-F���"�>���I0�6.mő������f��LiX�����'_j.�!���A�n��B3>5 ;��\Je<�j���k����' ”�#�t�ZW�D3
�I��o�8K�,��iwB&�=���ȩ"?��	W�0hH.��}QK}9J�9��M#�a2&5�Q���	S��}񗜧Ѡ:ٌM�I�^Y!��H�w��5�õ-�&�OvrE��(�9���*F�

�n����� �m�k9q�Tdu���_=m�
+���g	u��:��c5���'����n�I@��*��v>��Ǔbʑ�l�c2p�a6�\�K��+�WX�E������_��e��퓙.fu7����۔�C�h�/�i7��\��? �7�{v��z_�2m�|�,a3���ĭ�c6p+��f���n}?0jY�;
̞�9_b�i���ըW9r�u�5eM���K�{���Dj��Mڸ�3h��f�8;�u�ɉO,�5\痢�JV���o�#�zHn�*�E

data/lib/layout.css

@@ -1,13 +1,12 @@
 body {background-color: transparent }
 
 #wrap {
-  background-color: transparent; 
-  border: 1px solid transparent;
-  margin: 0 auto;
+  background-color: #d93; 
+  margin: 0;
   margin-bottom: 0.6em;
   overflow: hidden;
-  padding-bottom: 4em;
-  width: 750px;   
+  padding-bottom: 0.5em;
+  width: 690px;   
 }
 
   #wrap h1 {
@@ -16,15 +15,45 @@ body {background-color: transparent }
     padding: 0.2em 0.4em;
   }
 
-  #wrap .table {
-    background-color: transparent;
+  #wrap>div:first-child {
+    background-color: #458;
+    float:left;
+    width:405px;
+  }
+
+  #wrap>div:first-child>div {
+    background-color: #894;
     float: left;
-    height: 13em;
-    padding: 1em 0.8em;
-    margin: 0.5em;
+ 
+    padding: 0.4em 0.4em;
+    margin: 0.1em;
+  }
+
+    #wrap table {
+      background-color: transparent; 
+
+    }
+      #wrap table td {text-align: center}
+
+
+  #wrap>div:nth-child(2), #wrap>div:last-child {
+    background-color: #444;
+    font-size: 0.8em;
+    padding: 0.5em;
+    margin: 0.3em;
+
   }
+  #wrap>div:nth-child(2) {
+    background-color: #444;
+    float: left;
+    page-break-after: always;
 
-    #wrap table {background-color: transparent; }
-      #wrap table td {text-align: right}
+  }
 
+    #wrap>div:nth-child(2)>ul {
+      background-color: transparent;
+    }
 
+      #wrap>div:nth-child(2)>ul>li {
+        background-color: transparent;  
+      }

data/lib/month.css

@@ -9,12 +9,14 @@
 }
 
 #wrap  table{
-  background-color: rgba(230, 230, 170, 0.1);
+  background-color: rgba(230, 230, 170, 0.6);
   border: none;
+  font-family: Helvetica, Verdana, Serif;
+  font-size: 1.2em;
 }
 
 #wrap>table th{
-  background-color: rgba(180, 180, 150, 0.5);
+  background-color: rgba(180, 180, 150, 0.8);
   color: rgba(80, 80, 50, 0.8);
   border: 1px solid rgba(80, 80, 50, 0.8);
 }
@@ -24,17 +26,21 @@
 }
 
 #wrap>table tr>td{
+  background-color: rgba(130, 130, 160, 0.3);
+}
+
+#wrap>table tr>td>div{
   background-color: rgba(230, 230, 70, 0.4);
-  color: rgba(130, 130, 30,  1);
-  border: 1px solid rgba(80, 80, 50, 0.8);
+  color: rgba(80, 80, 30,  1);
+  margin: 0.3em;
 }
 
-#wrap>table tr>td.selected{
+#wrap>table tr>td>div.selected{
   /*background-color: transparent;*/
   border: 5px solid rgba(240, 150, 100, 0.9);  
   border-radius: 15px;
 }
 
-#wrap>table tr>td:nth-child(1), #wrap>table tr>td:nth-child(7){
+#wrap>table tr>td:nth-child(1)>div, #wrap>table tr>td:nth-child(7)>div{
   background-color: rgba(230, 230, 70, 0.2);
 }

data/lib/month_calendar.xsl

@@ -42,25 +42,32 @@
 </xsl:template>
 
 <xsl:template match="records/day">
+<td>
+<div>
   <xsl:apply-templates select="summary"/>
+  <xsl:apply-templates select="records"/>
+</div>
+</td>
 </xsl:template>
 
 <xsl:template match="day/summary">
-  <xsl:element name="td">
+
     <xsl:if test="css_style">
       <xsl:attribute name="class"><xsl:value-of select="css_style"/></xsl:attribute>
     </xsl:if>
-    <div>
-      <xsl:if test="title!=''">
-        <xsl:value-of select="xday"/>
-      </xsl:if>
-    </div>
 
-      <div><xsl:value-of select="bankholiday"/></div>
-      <div><xsl:value-of select="event"/></div>
+    <div><xsl:value-of select="xday"/></div>
+    <div><xsl:value-of select="bankholiday"/></div>
+    <div><xsl:value-of select="event"/></div>
 
-  </xsl:element>
 </xsl:template>
 
+<xsl:template match="records/entry">
+  <xsl:apply-templates select="summary"/>
+</xsl:template>
+
+<xsl:template match="entry/summary">
+      <strong><xsl:value-of select="title"/></strong>
+</xsl:template>
 
 </xsl:stylesheet>

data/lib/polyrex-calendar.rb

@@ -8,30 +8,26 @@ require 'nokogiri'
 require 'chronic_duration'
 require 'chronic_cron'
 
-MINUTE = 60
-HOUR = MINUTE * 60
-DAY = HOUR * 24
-WEEK = DAY * 7
-MONTH = DAY * 30
 
+MONTH = DAY * 30
 
 
 h = {
   calendar: 'calendar[year]',
      month: 'month[n, title]',
       week: 'week[n]',
-       day: 'day[n, event, date, bankholiday, title]',
+       day: 'day[sdate, xday, event, bankholiday, title]',
      entry: 'entry[time_start, time_end, duration, title]'
 }
-visual_schema = %i(calendar month week day entry).map{|x| h[x]}.join '/'
+visual_schema = h.values.join '/'
 PolyrexObjects.new(visual_schema)
 
 module LIBRARY
 
   def fetch_file(filename)
-    
+
     lib = File.dirname(__FILE__)
-    File.read filename
+    File.read filename      
   end
 
   def generate_webpage(xml, xsl)
@@ -84,14 +80,14 @@ class PolyrexObjects::Month
     month_layout_css = fetch_file self.css_layout
     month_css        = fetch_file self.css_style
 
-    File.open('self.xml','w'){|f| f.write self.to_xml pretty: true}
-    File.open('month.xsl','w'){|f| f.write month_xsl }
+    File.write 'self.xml', self.to_xml(pretty: true)
+    File.write 'month.xsl', month_xsl 
     #html = Rexslt.new(month_xsl, self.to_xml).to_xml
 
     # 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/week/records/day/summary[date='#{date}']")
+    e = doc.root.element("records/week/records/day/summary[sdate='#{date}']")
     e.add Rexle::Element.new('css_style').add_text('selected')
 
     html = generate_webpage doc.xml, month_xsl
@@ -117,8 +113,8 @@ class PolyrexObjects::Week
     week_layout_css = fetch_file 'week_layout.css'
     week_css        = fetch_file 'week.css'
 
-    File.open('self.xml','w'){|f| f.write self.to_xml pretty: true}
-    File.open('week.xsl','w'){|f| f.write week_xsl }        
+    File.write 'self.xml', self.to_xml(pretty: true)
+    File.write 'week.xsl', week_xsl
     #html = Rexslt.new(week_xsl, self.to_xml).to_xml
     #html = xsltproc 'week_calendar.xsl', self.to_xml
 
@@ -135,6 +131,21 @@ class PolyrexObjects::Week
   end  
 end
 
+class PolyrexObjects::Day
+
+  def date()
+    Date.parse(self.sdate)
+  end
+
+  def wday()
+    self.date.wday
+  end
+
+  def day()
+    self.date.day
+  end
+end
+
 class PolyrexCalendar
   include LIBRARY
 
@@ -146,15 +157,14 @@ class PolyrexCalendar
     opts = {year: Time.now.year.to_s}.merge(options)
     @year = opts[:year]
 
-    @h = {
+    h = {
       calendar: 'calendar[year]',
          month: 'month[n, title]',
           week: 'week[n]',
-           day: 'day[n, event, date, bankholiday]',
+           day: 'day[sdate, xday, event, bankholiday]',
          entry: 'entry[time_start, time_end, duration, title]'
     }
-    schema = %i(calendar month day entry).map{|x| @h[x]}.join '/'
-    #@visual_schema = %i(calendar month week day entry).map{|x| @h[x]}.join '/'
+    schema = %i(calendar month day entry).map{|x| h[x]}.join '/'
 
 
     if calendar_file then
@@ -174,13 +184,16 @@ class PolyrexCalendar
 
         @polyrex.create.month no: month.to_s, title: Date::MONTHNAMES[month]  do |create|
           days.each do |x|
-            create.day  n: x.day, wday: x.wday, date: x.strftime("%Y-%b-%d")
+            create.day sdate: x.strftime("%Y-%b-%d"), xday: x.day.to_s
           end
         end
       end
 
     end
 
+    visual_schema = h.values.join '/'
+    PolyrexObjects.new(visual_schema)
+
     @xsl = fetch_file 'calendar.xsl'
     @css = fetch_file 'layout.css'
        
@@ -210,7 +223,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, moday_week: true) }
 
     px.xslt = 'kplanner.xsl'
     px.css_layout = 'monthday_layout.css'
@@ -236,46 +249,30 @@ class PolyrexCalendar
     
   end
 
-  def month(m, strict: false)
+  def month(m, monday_week: false)
 
-    cal_month = @polyrex.records[m-1]
+    if monday_week == true
 
-    if strict == true then
+      pxmonth = make_month(m) do |a, wday|
 
-      days_in_month = cal_month.xpath('records/week/records/.')\
-        .select {|x| Date.parse(x.text('summary/date')).month == m}
+        # Monday start
+        # wdays: 1 = Monday, 0 = Sunday
 
-      doc_month = Rexle.new cal_month.to_xml
-      records = doc_month.root.element 'records'
-      records.insert_before Rexle::Element.new('records')
+        r = case wday
 
-      records.delete
+          # the 1st day of the month is a Monday, add no placeholders
+          when 1 then  a
 
-      pxmonth = PolyrexObjects::Month.new doc_month.root
+          # the 1st day is a Sunday, add 6 placeholders before that day
+          when 0 then Array.new(6) + a
 
-      a = days_in_month
-      i = a[0].text('summary/wday').to_i
-
-      a2 = if i > 1 then
-        Array.new(i - 1) + a
-      elsif i < 1 then
-        Array.new(6) + a
-      else
-        a
-      end
-
-      a2.each_slice(7) do |days_in_week|
-
-        pxweek = PolyrexObjects::Week.new \
-                Rexle.new('<week><summary/><records/></week>').root
+          # add a few placeholders before the 1st day          
+          else Array.new(wday - 1) + a
+        end
 
-        days_in_week.each do |day|
+        r
 
-          day = Rexle.new("<day><summary/><records/></day>") unless day
-          pxweek.add PolyrexObjects::Day.new(day.root)
-        end
 
-        pxmonth.add pxweek
       end
 
       pxmonth.xslt = 'monthday_calendar.xsl'
@@ -284,11 +281,29 @@ class PolyrexCalendar
       pxmonth
 
     else
-      cal_month.xslt = 'month_calendar.xsl'
-      cal_month.css_layout = 'month_layout.css'
-      cal_month.css_style = 'month.css'
 
-      cal_month
+      pxmonth = make_month(m) do |a, wday|
+
+        # Sunday start
+        # wdays: 1 = Monday, 0 = Sunday
+
+        r = case wday
+
+          # the 1st day of the month is a Sunday, add no placeholders
+          when 0 then  a
+
+          # add a few placeholders before the 1st day          
+          else Array.new(6 - wday) + a
+        end
+
+        r
+
+      end
+
+      pxmonth.xslt = 'month_calendar.xsl'
+      pxmonth.css_layout = 'month_layout.css'
+      pxmonth.css_style = 'month.css'
+      pxmonth
     end
 
   end
@@ -321,6 +336,7 @@ class PolyrexCalendar
 
     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
@@ -385,8 +401,7 @@ class PolyrexCalendar
 
     polyrex.records.each do |day|
 
-      d1 = Date.parse(day.date)
-      sd = d1.strftime("%Y-%b-%d ")
+      sd = day.date.strftime("%Y-%b-%d ")
       m,w,i = @day[d1]
 
       cal_day = @polyrex.records[m].week[w].day[i]
@@ -443,6 +458,58 @@ class PolyrexCalendar
     end 
     
   end
+
+  def make_month(m)
+
+    cal_month = @polyrex.records[m-1]
+    days_in_month = cal_month.records
+    pxmonth = cal_month.clone
+    pxmonth.records.each(&:delete)
+
+    a = days_in_month
+
+    i = a[0].wday
+
+    a2 = yield(a, i)
+
+    a2.each_slice(7) do |days_in_week|
+
+      pxweek = PolyrexObjects::Week.new
+
+      days_in_week.each do |day| 
+
+        new_day = day ? day.deep_clone : PolyrexObjects::Day.new
+        pxweek.add new_day
+      end
+
+      pxmonth.add pxweek
+    end
+
+    week1 = pxmonth.week[0]
+
+    other_days = week1.day.select{|day| day.sdate.empty? }
+    start_date = week1.day[other_days.length].date
+
+    other_days.reverse.each.with_index do |day, i|
+      day.sdate = (start_date - (i+1)).strftime("%Y %b %d")
+      day.xday = day.date.day.to_s
+    end
+
+    last_week = pxmonth.week[-1]
+
+    gap = 7 - last_week.records.length
+    end_date = last_week.day.last.date
+
+    gap.times do |i|
+
+      day = PolyrexObjects::Day.new
+      day.sdate = (end_date + (i+1)).strftime("%Y %b %d")
+      day.xday = day.date.day.to_s
+      last_week.add day
+    end
+
+    pxmonth
+  end
     
   def ordinal(val)
     (10...20).include?(val) ? \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   CIpMEIXEnQwmcmWL07xvpUquKTab0tCXtmcfjr74KP2KCm5guZyxeXaj9lD1OrnC
   Kgt/mRI2beG8K7QY81GGMsQjiG95Dcko
   -----END CERTIFICATE-----
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex