polyrex-calendar 0.1.15 → 0.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/lib/calendar.xsl +9 -5
  5. data/lib/month_calendar.xsl +9 -18
  6. data/lib/polyrex-calendar.rb +16 -9
  7. data/lib/week.xsl +1 -1
  8. metadata +2 -2
  9. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bb941b9ce09a7826d6ef965a8c1b5bee0e4cfc4f
4
- data.tar.gz: 351f4020b16f485cdb8b9968fe9440f2f3aa16ce
3
+ metadata.gz: 4cf8e583aa3cd726ed3d6d8f1278d15d144ceff7
4
+ data.tar.gz: 538872a0e3f3503142f3419084dd5133231fda71
5
5
  SHA512:
6
- metadata.gz: c53727432e3f781dd3444aa60027154c1494678b8f1ec8abff78aa7c817a21bd2ffda5a0c974f97ba9cf01862625f5c79e72171420f2603ac98c620f894a801d
7
- data.tar.gz: 6adc0c1d066f3dafe2573749fce04dd0a01da1dd272e6f2f45b82ae1248d6567bd7b5ed9af44739b3edb4d3ebb205381732a22f7dc1326a98998e1ac98e03d56
6
+ metadata.gz: 32066bba8d5ed3154f5f72392736ae8ea0fc9ffbc02a670b99623fd8632c763350ce1d5903426282c168c4040e1c6e35e82143e576a5e0aefd037be9bc2d7a09
7
+ data.tar.gz: f364effcd757b7baa1f0c073fc4dd3384189c309f7a44e11a3b9bd0c50d82150f760cef667394abd8e3bb886537d0e40bd432a78d9c7806fb8942be467a60181
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/calendar.xsl CHANGED
@@ -7,8 +7,8 @@
7
7
  <html lang="en">
8
8
 
9
9
  <head>
10
- <title><xsl:value-of select="summary/year"/> Calendar | generated by Polrex-Calendar</title>
11
- <link rel="stylesheet" href="xlayout.css"/>
10
+ <title><xsl:value-of select="summary/year"/> Calendar | generated by Polyrex-Calendar</title>
11
+ <link rel="stylesheet" href="layout.css"/>
12
12
  </head>
13
13
 
14
14
  <body>
@@ -32,7 +32,7 @@
32
32
  </xsl:template>
33
33
 
34
34
  <xsl:template match="month/summary">
35
- <caption><xsl:value-of select="name"/></caption>
35
+ <caption><xsl:value-of select="title"/></caption>
36
36
  </xsl:template>
37
37
 
38
38
  <xsl:template match="records/week">
@@ -53,11 +53,15 @@
53
53
 
54
54
  <xsl:template match="day/summary">
55
55
  <td>
56
- <xsl:if test="name!=''">
56
+ <xsl:if test="overlap=''">
57
57
  <xsl:value-of select="xday"/>
58
58
  </xsl:if>
59
59
 
60
60
  </td>
61
61
  </xsl:template>
62
62
 
63
- </xsl:stylesheet>
63
+ <xsl:template match="records/entry">
64
+ </xsl:template>
65
+
66
+
67
+ </xsl:stylesheet>
data/lib/month_calendar.xsl CHANGED
@@ -7,13 +7,13 @@
7
7
  <html lang="en">
8
8
 
9
9
  <head>
10
- <title><xsl:value-of select="summary/name"/><xsl:text> </xsl:text><xsl:value-of select="summary/year"/> planner | generated by Polyrex-Calendar</title>
10
+ <title><xsl:value-of select="summary/title"/><xsl:text> </xsl:text><xsl:value-of select="summary/year"/> planner | generated by Polyrex-Calendar</title>
11
11
  <link rel="stylesheet" href="month_layout.css"/>
12
12
  </head>
13
13
 
14
14
  <body>
15
15
  <div id="wrap">
16
- <h1><xsl:value-of select="summary/name"/><xsl:text> </xsl:text><xsl:value-of select="summary/year"/></h1>
16
+ <h1><xsl:value-of select="summary/title"/><xsl:text> </xsl:text><xsl:value-of select="summary/year"/></h1>
17
17
  <table border="1">
18
18
  <tr><th>Sunday</th><th>Monday</th><th>Tuesday</th><th>Wednesday</th><th>Thursday</th><th>Friday</th><th>Saturday</th></tr>
19
19
  <xsl:apply-templates select="records"/>
@@ -25,7 +25,7 @@
25
25
  </xsl:template>
26
26
 
27
27
  <xsl:template match="month/summary">
28
- <caption><xsl:value-of select="name"/></caption>
28
+ <caption><xsl:value-of select="title"/></caption>
29
29
  </xsl:template>
30
30
 
31
31
 
@@ -47,27 +47,18 @@
47
47
  <xsl:template match="day/summary">
48
48
  <td>
49
49
  <div>
50
- <xsl:if test="name!=''">
50
+ <xsl:if test="title!=''">
51
51
  <xsl:value-of select="xday"/>
52
52
  </xsl:if>
53
53
  </div>
54
- <xsl:choose>
55
- <xsl:when test="contains(event,'oliday')">
56
- <div><xsl:value-of select="event"/></div>
57
- <div></div>
58
- </xsl:when>
59
- <xsl:when test="substring(event,1,1) = '*'">
60
- <div><xsl:value-of select="substring-after(event,'*')"/></div>
61
- <div></div>
62
- </xsl:when>
63
- <xsl:otherwise>
64
- <div></div>
54
+
55
+ <div><xsl:value-of select="bankholiday"/></div>
65
56
  <div><xsl:value-of select="event"/></div>
66
- </xsl:otherwise>
67
- </xsl:choose>
57
+
58
+
68
59
 
69
60
  </td>
70
61
  </xsl:template>
71
62
 
72
63
 
73
- </xsl:stylesheet>
64
+ </xsl:stylesheet>
data/lib/polyrex-calendar.rb CHANGED
@@ -1,4 +1,4 @@
1
- #!/usr/bin/ruby
1
+ #!/usr/bin/env ruby
2
2
 
3
3
  # file: polyrex-calendar.rb
4
4
 
@@ -174,13 +174,20 @@ class PolyrexCalendar
174
174
  def this_month()
175
175
  self.month(DateTime.now.month)
176
176
  end
177
+
178
+ def import_bankholidays(dynarex)
179
+ import_dynarex(dynarex, :bankholiday=)
180
+ end
177
181
 
178
182
  private
179
183
 
180
- def import_dynarex(dynarex)
184
+ def import_dynarex(dynarex, daytype=:event=)
185
+
181
186
  dynarex.flat_records.each do |event|
182
- m,w,i = @day[Date.parse(event[:date])]
183
- @polyrex.records[m].week[w].day[i].event = event[:title]
187
+
188
+ date = Date.parse(event[:date])
189
+ m,w,i = @day[date]
190
+ @polyrex.records[m].week[w].day[i].method(daytype).call event[:title]
184
191
  end
185
192
  end
186
193
 
@@ -275,8 +282,8 @@ class PolyrexCalendar
275
282
  end
276
283
 
277
284
  @a = months
278
- @schema = 'calendar[year]/month[no,name,year]/week[no, rel_no, mon, label]/' + \
279
- 'day[wday, xday, name, event, date, ordinal, overlap]/' + \
285
+ @schema = 'calendar[year]/month[no,title,year]/week[no, rel_no, mon, label]/' + \
286
+ 'day[wday, xday, title, event, date, ordinal, overlap, bankholiday]/' + \
280
287
  'entry[time_start, time_end, duration, title]'
281
288
  @polyrex = Polyrex.new(@schema, id_counter: @id)
282
289
  year_start = months[0][0][-1]
@@ -287,7 +294,7 @@ class PolyrexCalendar
287
294
 
288
295
  months.each_with_index do |month,i|
289
296
  month_name = Date::MONTHNAMES[i+1]
290
- @polyrex.create.month no: (i+1).to_s, name: month_name, year: @year do |create|
297
+ @polyrex.create.month no: (i+1).to_s, title: month_name, year: @year do |create|
291
298
  month.each_with_index do |week,j|
292
299
 
293
300
  # jr241213 week_s = (week_i == 0 ? old_year_week : week_i).to_s
@@ -317,14 +324,14 @@ class PolyrexCalendar
317
324
  x = day
318
325
  week_i += 1 if x.wday == 6
319
326
  h = {wday: x.wday.to_s, xday: x.day.to_s, \
320
- name: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
327
+ title: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
321
328
  ordinal: x.day.to_i.ordinal}
322
329
  else
323
330
  #if blank find the nearest date in the week and calculate this date
324
331
  # check right and if nothing then it's at the end of the month
325
332
  x = week[-1] ? (week[-1] - (7-(k+1))) : week[0] + k
326
333
  h = {wday: x.wday.to_s, xday: x.day.to_s, \
327
- name: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
334
+ title: Date::DAYNAMES[k], date: x.strftime("%Y-%b-%d"), \
328
335
  ordinal: x.day.to_i.ordinal, overlap: 'true'}
329
336
  end
330
337
 
data/lib/week.xsl CHANGED
@@ -52,7 +52,7 @@
52
52
  </xsl:template>
53
53
 
54
54
  <xsl:template match='day/summary'>
55
- <h2><xsl:value-of select="name"/> <xsl:text> </xsl:text><xsl:value-of select="xday"/><xsl:value-of select="ordinal"/></h2>
55
+ <h2><xsl:value-of select="title"/> <xsl:text> </xsl:text><xsl:value-of select="xday"/><xsl:value-of select="ordinal"/></h2>
56
56
  </xsl:template>
57
57
 
58
58
  <xsl:template match='day/records'>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: polyrex-calendar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.15
4
+ version: 0.1.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
29
29
  CIpMEIXEnQwmcmWL07xvpUquKTab0tCXtmcfjr74KP2KCm5guZyxeXaj9lD1OrnC
30
30
  Kgt/mRI2beG8K7QY81GGMsQjiG95Dcko
31
31
  -----END CERTIFICATE-----
32
- date: 2013-12-24 00:00:00.000000000 Z
32
+ date: 2013-12-26 00:00:00.000000000 Z
33
33
  dependencies:
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: polyrex
metadata.gz.sig CHANGED
Binary file