Hi,
this patch is to change the "Time of Day" select box in the edit favorites
page of the webpages. The original only allows selection of times that are
on the hour or half hour. Should any UK user wish to set a favorite for
Neighbours then starting at 13:40 daily no recordings would be scheduled
for it.
In the patch the one select box has been expanded to 3 boxes, one for
hour, one for minutes (in 5 minute intervals) and one for am/pm. When
adding a program to favorites these boxes automatically select the correct
time for the program (like the original does). All it really does it take
the three values and work out what the correct value for "mod" is.
I hope to add the same changes to the freevo interface, but not sure if
it's possible to add extra item lists next to each other (i.e 3 in a row).
I'm fairly new to python (started last night), so any pointers would be
appreciated.
Cheers,
Alex
Index: src/util/tv_util.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/tv_util.py,v
retrieving revision 1.6
diff -r1.6 tv_util.py
109,110c109,110
< if rem == 0:
< rem = '00'
---
> if rem < 10:
> rem = '0%s' % rem
Index: src/www/htdocs/edit_favorite.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/edit_favorite.rpy,v
retrieving revision 1.17.2.1
diff -r1.17.2.1 edit_favorite.rpy
255,256c255,303
< cell = '\n<select name="mod" selected="%s">\n' % fav.mod
< cell += ' <option value="ANY">'+_('ANY TIME')+'</option>\n'
---
> if fav.mod != 'ANY':
> mod_hour = int(fav.mod/60)
> mod_min = fav.mod - (mod_hour*60)
> if mod_hour > 12:
> mod_hour = mod_hour - 12
> mod_moaf = 2
> else:
> mod_moaf = 1
> else:
> mod_hour = 'ANY'
> mod_min = 'ANY'
> mod_moaf = 'ANY'
>
> cell = '\n<select name="mod_hour" selected="%s" STYLE="width: 50px">\n' % mod_hour*60
> cell += ' <option value="ANY">'+_('ANY TIME')+'</option>'
> cell += """
> <option value="0">12</option>
> <option value="60">1</option>
> <option value="120">2</option>
> <option value="180">3</option>
> <option value="240">4</option>
> <option value="300">5</option>
> <option value="360">6</option>
> <option value="420">7</option>
> <option value="480">8</option>
> <option value="540">9</option>
> <option value="600">10</option>
> <option value="660">11</option>
> </select>
> """
> cell += '\n<select name="mod_min" selected="%s" STYLE="width: 50px">\n' % mod_min
> cell += ' <option value="ANY">'+_('ANY TIME')+'</option>'
> cell += """
> <option value="0">00</option>
> <option value="5">05</option>
> <option value="10">10</option>
> <option value="15">15</option>
> <option value="20">20</option>
> <option value="25">25</option>
> <option value="30">30</option>
> <option value="35">35</option>
> <option value="40">40</option>
> <option value="45">45</option>
> <option value="50">50</option>
> <option value="55">55</option>
> </select>
> """
> cell += '\n<select name="mod_moaf" selected="%s" STYLE="width: 50px">\n' % mod_moaf
> cell += ' <option value="ANY">'+_('ANY TIME')+'</option>'
258,305c305,306
< <option value="0">12:00 AM</option>
< <option value="30">12:30 AM</option>
< <option value="60">1:00 AM</option>
< <option value="90">1:30 AM</option>
< <option value="120">2:00 AM</option>
< <option value="150">2:30 AM</option>
< <option value="180">3:00 AM</option>
< <option value="210">3:30 AM</option>
< <option value="240">4:00 AM</option>
< <option value="270">4:30 AM</option>
< <option value="300">5:00 AM</option>
< <option value="330">5:30 AM</option>
< <option value="360">6:00 AM</option>
< <option value="390">6:30 AM</option>
< <option value="420">7:00 AM</option>
< <option value="450">7:30 AM</option>
< <option value="480">8:00 AM</option>
< <option value="510">8:30 AM</option>
< <option value="540">9:00 AM</option>
< <option value="570">9:30 AM</option>
< <option value="600">10:00 AM</option>
< <option value="630">10:30 AM</option>
< <option value="660">11:00 AM</option>
< <option value="690">11:30 AM</option>
< <option value="720">12:00 PM</option>
< <option value="750">12:30 PM</option>
< <option value="780">1:00 PM</option>
< <option value="810">1:30 PM</option>
< <option value="840">2:00 PM</option>
< <option value="870">2:30 PM</option>
< <option value="900">3:00 PM</option>
< <option value="930">3:30 PM</option>
< <option value="960">4:00 PM</option>
< <option value="990">4:30 PM</option>
< <option value="1020">5:00 PM</option>
< <option value="1050">5:30 PM</option>
< <option value="1080">6:00 PM</option>
< <option value="1110">6:30 PM</option>
< <option value="1140">7:00 PM</option>
< <option value="1170">7:30 PM</option>
< <option value="1200">8:00 PM</option>
< <option value="1230">8:30 PM</option>
< <option value="1260">9:00 PM</option>
< <option value="1290">9:30 PM</option>
< <option value="1320">10:00 PM</option>
< <option value="1350">10:30 PM</option>
< <option value="1380">11:00 PM</option>
< <option value="1410">11:30 PM</option>
---
> <option value="0">AM</option>
> <option value="1">PM</option>
340c341,353
< fv.res += 'document.editfavorite.mod.options[0].selected=true\n'
---
> fv.res += 'document.editfavorite.mod_hour.options[0].selected=true\n'
> else:
> mod_index = mod_hour+1
> fv.res += 'document.editfavorite.mod_hour.options[%s].selected=true\n' % mod_index
>
> if fav.mod == 'ANY':
> fv.res += 'document.editfavorite.mod_min.options[0].selected=true\n'
> else:
> mod_min_index = (mod_min/5)+1
> fv.res += 'document.editfavorite.mod_min.options[%s].selected=true\n' % mod_min_index
>
> if fav.mod == 'ANY':
> fv.res += 'document.editfavorite.mod_moaf.options[0].selected=true\n'
342,343c355
< mod_index = int(fav.mod)/30 + 1
< fv.res += 'document.editfavorite.mod.options[%s].selected=true\n' % mod_index
---
> fv.res += 'document.editfavorite.mod_moaf.options[%s].selected=true\n' % mod_moaf
344a357,358
>
>
Index: src/www/htdocs/favorites.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/favorites.rpy,v
retrieving revision 1.17
diff -r1.17 favorites.rpy
142c142,144
< mod = fv.formValue(form, 'mod')
---
> mod_hour = fv.formValue(form, 'mod_hour')
> mod_min = fv.formValue(form, 'mod_min')
> mod_moaf = fv.formValue(form, 'mod_moaf')
144c146,162
<
---
>
> if mod_hour is None:
> mod_hour = 0
> elif mod_hour != 'ANY':
> mod_hour = int(mod_hour)
>
> if mod_min is None:
> mod_min = 0
> elif mod_min != 'ANY':
> mod_min = int(mod_min)
>
> if mod_hour == 'ANY' or mod_min == 'ANY' or mod_moaf == 'ANY':
> mod = 'ANY'
> else:
> if mod_moaf == '1':
> mod_hour = (mod_hour + 720)
> mod = (mod_hour + mod_min)
