Commit Graph

318 Commits

Author SHA1 Message Date
drigato 6249deb1ac Removed unused function.
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
Albert Santoni 11de8bd988 Clean up and simplifcation of linked show filling 2014-08-21 13:39:25 -04:00
drigato 2a2b4bd05a Added comments and removed some unused code 2014-10-15 17:11:38 -04:00
drigato 660b1a0596 Removed old comments 2014-08-21 09:47:54 -04:00
drigato 4c03e12ea1 Better way of getting the linked show schedule and moved that into its own function.
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-20 16:37:44 -04:00
drigato 4a124a8faf CC-5904: New linked show instances may get an old copy of the schedule
Change the way get the show stamp
2014-08-18 19:27:42 -04:00
drigato 3fa15913c0 CC-5904: New linked show instances may get an old copy of the schedule
Better way of getting show stamp
Renamed variables
2014-08-18 18:55:03 -04:00
drigato b9ecd00d33 CC-5904: New linked show instances may get an old copy of the schedule 2014-08-18 18:10:45 -04:00
drigato 62f8a65573 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Conflicts:
	airtime_mvc/application/services/SchedulerService.php
2014-08-18 13:03:22 -04:00
drigato 2cfc20d0c1 CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks 2014-08-18 12:59:43 -04:00
Albert Santoni 60f4d112e7 Optimized linked shows schedule filling
* Fairly big improvement in memory usage and execution time for 24 hour linked
  shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
Albert Santoni f072d60ff1 Optimized linked shows schedule filling
* Fairly big improvement in memory usage and execution time for 24 hour linked
  shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
drigato 33f397f577 remove memory usage log statements 2014-08-15 16:25:37 -04:00
drigato f863f4dfcf More mem usage logs 2014-08-15 15:41:00 -04:00
drigato 2bc8f6d403 Logging memory usage 2014-08-15 15:36:13 -04:00
drigato 26b210ded9 Commented out unnecessary functions using too much memory 2014-08-15 15:32:52 -04:00
drigato fe8e004d87 CC-5898: Future repeating shows may not get generated and/or filled with content
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
drigato 520387fcad CC-5898: Future repeating shows may not get generated and/or filled with content
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
drigato 66e6c23311 CC-5634: Can add/remove content to a linked show while one instance is currently playing 2014-06-09 12:07:27 -04:00
drigato ee489b39f9 CC-5869: Changing a repeating show to non-repeating and changing start time does not work 2014-06-06 14:51:01 -04:00
drigato e4bb97bcc4 CC-5867: Can't edit show instance 2014-06-06 12:22:59 -04:00
drigato eafbd7d5e9 CC-5838: Editing a repeating show yields in error if an instance is in the past
Was not checking if show is repeating properly
2014-05-06 13:01:20 -04:00
drigato 14c670aa20 CC-5728: Problem when removing repeat option and changing start date 2014-03-10 17:41:57 -04:00
drigato 8ad866c2a2 Fixed changing the start date on a non-repeating show 2014-03-10 17:32:54 -04:00
drigato 6b91d2daf8 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-07 14:52:32 -05:00
drigato 35fd639c1c CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 11:18:13 -05:00
drigato 51b5cc2052 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 10:54:40 -05:00
drigato 426b75b635 CC-5724: Changing start date of a repeating show will update content incorrectly 2014-03-05 14:37:07 -05:00
drigato ebc68b980c CC-5718: Show content can get scheduled in instances that are in the past
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
2014-03-05 13:12:27 -05:00
drigato 7660e0cd84 CC-5719: Incorrect show content start time
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
2014-03-04 11:29:49 -05:00
drigato 753003639f CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
2014-02-25 17:22:17 -05:00
drigato f1658f6490 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
2014-02-25 17:16:14 -05:00
drigato 3db1cd412a CC-5697: Editing a linked show's repeat day sets wrong day for show content
Optimized how we store the instance ids that already exist
2014-02-25 16:51:48 -05:00
drigato 6cd84363a6 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Added comment
2014-02-24 16:04:48 -05:00
drigato 787f19f69a CC-5697: Editing a linked show's repeat day sets wrong day for show content
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
2014-02-24 14:49:11 -05:00
drigato 3b9608a8df CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
drigato ce7eddf563 CC-5678: Scheduler: Show's contents won't follow show's scheduled time change
Fixed by storing original cc_show_day object by value
2014-01-30 12:07:24 -05:00
Albert Santoni c9d98e4e10 Small Airtime Pro fix for ShowFormService 2014-01-27 14:31:33 -05:00
drigato d5112f0368 Added comments for a show_service function 2014-01-20 17:05:37 -05:00
drigato 0b4ae6b94d CC-5651: Unit Test the Scheduler
Added test for deleting repeating show instances
2014-01-14 14:16:37 -05:00
drigato 0f107dbad3 Initial unit test configuration 2014-01-13 11:43:16 -05:00
drigato 9e5cfe0d39 CC-5666: Deleting a show instance can revert the 'no end' option 2014-01-13 11:41:44 -05:00
drigato 27c3637591 CC-5640: End time does not get updated when editing the current playing show
Was checking if the start time was in the past, but we should check if the
end time is in the past. This way you can extend or shrink shows that are currently playing.
2013-12-16 15:27:51 -05:00
Albert Santoni 0afaeadb15 CC-5641: Can Create Zero or Negative Length Shows
* Fixed two underlying causes of zero or negative length shows
  that could be created over DST time changes:
    - Fixed incorrect end time arithmetic which did not preserve the
      show duration.
    - Fixed a desynchronization issue due to FullCalendar handling
      events over DST differently from Airtime.
2013-12-14 22:38:33 -05:00
drigato d841f11de3 CC-5638: Shows become unlinked when moving the end time back
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
drigato e8a8aeaf00 CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated
Made all show fields readonly when editing a repeating instance
2013-12-13 12:13:58 -05:00
Naomi bbccc2e7d3 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 17:18:17 -05:00
Naomi 87ac5dc294 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-12 17:18:03 -05:00
drigato d0474f4247 Changed function title when editing a repeating instance
Removed a function call we don't need when editing a repeating instance
2013-12-12 16:47:55 -05:00
drigato f37b9a3796 CC-5634: Can add/remove content to a linked show while one instance is currently playing
small logic fix
2013-12-12 13:23:20 -05:00
drigato fb793ff3e1 CC-5634: Can add/remove content to a linked show while one instance is currently playing
Fixed by removing option from context menu
2013-12-12 13:01:33 -05:00
Naomi 67031a75fe CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 18:56:19 -05:00
drigato 9237692782 CC-5630: Shows created on a DST border get scheduled an extra hour longer
The show start and end time need to be in the show's local timezone when adding
or subtracting time to the start and end time (in case of DST crossings). In this
case the end time was already converted to UTC when we tried to change the time.
2013-12-11 14:45:16 -05:00
Albert Santoni 0919915c6b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-09 16:27:06 -05:00
drigato 310cfddd3a CC-5626: Context menu -> Edit -> Doesn't populate show forms properly 2013-12-09 14:53:58 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -05:00
drigato cdfdbc4da2 Removed unused code 2013-12-06 16:51:13 -05:00
Naomi 7e9ca3e950 CC-5594 : Remove all date_default_timezone_get()
updating move show code to work with the user's timezone.
unified method signature for updateScheduleStartTime to always use the $diff param.
2013-12-06 12:33:36 -05:00
Naomi ec6a991090 CC-5594 : Remove all date_default_timezone_get()
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
2013-12-05 15:57:00 -05:00
Naomi b1842fff34 Merge branch '2.5.x' into cc-5594-date_default 2013-12-05 15:13:54 -05:00
Naomi 39063aaadb CC-5594 : Remove all date_default_timezone_get()
using the user selected timezone in the form to calculate duration.
2013-12-05 15:12:01 -05:00
drigato 86ed77a106 CC-5599: Can drag and drop an edited repeating instance on calendar
Fixed by properly checking if a show is repeating or not
2013-12-04 15:02:14 -05:00
drigato ab435ce3ec CC-5598: Deleting an edited, repeated instance deletes the entire show
Fixed by setting the correct url action
2013-12-04 14:50:22 -05:00
Naomi 82b40f52e7 Merge branch '2.5.x' into cc-5594-date_default 2013-12-04 14:42:30 -05:00
Naomi e6808b0c12 CC-5594 : Remove all date_default_timezone_get()
removing now unused old methods
2013-12-04 14:31:23 -05:00
drigato 49ed0cf0f1 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Removed redundant function call to update last_scheduled column on a cc_show_instance
2013-12-04 14:28:16 -05:00
drigato 7f8f084c98 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Refactored cc_show_day->getLocalEndDateAndTime() function
2013-12-04 14:17:19 -05:00
drigato 22595c1098 CC-5596: Can Recreate an Instance in a Location that has been modified
Fixed by updating the modified instance's start/end time and leaving as a placeholder
for future show updates
2013-12-04 11:36:38 -05:00
drigato 6c71b17024 CC-5595: Improper day of week comparison
Need to convert show instance start time to the show's local timezone before getting
the repeat day of week
2013-12-04 10:05:32 -05:00
drigato 02453c52ee Copy/paste error
Was setting cc_show_days twice
2013-12-04 09:00:43 -05:00
drigato a164416c84 Fixed minor bugs 2013-12-04 09:00:43 -05:00
drigato ef8af1b724 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
2013-12-04 09:00:43 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
drigato f571000657 Fixed updating single show instance problem where it wasn't fetching
the current instance
2013-11-26 12:32:05 -05:00
Albert Santoni 050d984882 CC-5487 : Calendar won't load under certain situation with linked shows 2013-10-30 18:09:57 -04:00
drigato c9549c6a1d Delete unused code 2013-10-28 10:34:18 -04:00
denise 787ecdc3fa CC-5384: Drag & drop show sets wrong time
Was not setting new start time on cc_show_day object
2013-10-15 16:01:42 -04:00
Naomi f2a794168d CRLF 2013-10-11 16:31:34 -04:00
Naomi 470f0b2a7f CC-5408 : Can't add content to now playing show on calendar page
can schedule the now playing show from the calendar page.
2013-10-11 16:30:49 -04:00
Naomi 4c331aa955 CRLF 2013-10-11 11:08:49 -04:00
Naomi 61bab553ff CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log 2013-10-11 11:07:59 -04:00
Naomi 0c4dcda508 CC-5394 : File Summary Fix
need to check if length is set.
2013-10-10 16:01:53 -04:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -04:00
denise 3261bd6307 Small formatting change 2013-10-09 17:38:06 -04:00
denise 05e4195165 CC-5390: Cannot drag & drop record show that has a rebroadcast
Was using wrong method to query for the rebroadcast show's
original recorded show
2013-10-09 17:24:16 -04:00
denise 4daa34d14b CC-5364: Problem with drag & drop recording show on calendar 2013-10-09 17:11:39 -04:00
denise aadbf0b200 CC-5384: Drag & drop show sets wrong time
Start time was getting stored in UTC in cc_show_days when it
should be stored in the show's local timezone
2013-10-09 16:55:56 -04:00
denise 807833e3f3 CC-5361: Create show from repeating instance could have wrong time 2013-10-08 17:38:03 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime
Conflicts:
	airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
denise 8a25d9cd2e CC-5376: Sometimes schedule times don't get updated 2013-10-07 15:53:33 -04:00
denise ff46883c1b CC-5360: Updating a Show over a timezone change period has problems
Need to apply the old timezone to show start time when attempting to
fetch current instance
2013-10-07 14:16:20 -04:00
denise 60b4eb5c8a Removed unnecessary formating when comparing DateTime objects 2013-10-04 09:49:23 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
denise 34e2344100 CC-5323: User's Timezone Can Improperly Edit Show
Sometimes show form would populate the start/end time with wrong timezone
2013-09-25 17:18:23 -04:00
denise 3e5a6b2a3d CC-5323: User's Timezone Can Improperly Edit Show
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
2013-09-25 16:40:55 -04:00