Commit Graph

277 Commits

Author SHA1 Message Date
Naomi e047c2f71d can configure the file summary template as well now. 2013-08-02 16:15:32 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi b480a5ae18 crlf 2013-08-02 11:19:46 -04:00
Naomi 6e43094d10 pagination working properly (but not with filtering, have removed serach for now anyways.) 2013-08-02 11:18:15 -04:00
denise 8ba95b3587 CC-5262: PHP error happens when creating shows
SAAS only because there is no recording show form
2013-08-02 11:03:14 -04:00
Naomi af38d3cb02 CRLF 2013-08-01 17:10:04 -04:00
Naomi 2341b7b68c can order data in the item table 2013-08-01 17:09:42 -04:00
Naomi 557b3f9c9b CRLF 2013-08-01 16:37:10 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
denise 06f5f2f5a7 CC-5283: Calendar gets messy, possibly after upgrade 2013-08-01 15:38:34 -04:00
Naomi b33f33964a crlf 2013-07-31 17:39:45 -04:00
Naomi 7ca28fe81d history item datatable is set up with configurable columns now.
should add a field when configuring template field for "display name"
2013-07-31 17:38:48 -04:00
Naomi 0c9c0c16e8 working on sql for custom templates 2013-07-30 20:04:10 -04:00
Naomi 07819d895d fix added to avoid a blank row in aggregate view 2013-07-30 19:32:31 -04:00
Naomi a170ee7308 crlf 2013-07-30 19:25:06 -04:00
Naomi 7ca3048f36 can add a new list item using the template.
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
Naomi 06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi a2d4af5449 CRLF 2013-07-29 17:22:44 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi db4e025c05 CRLF fix 2013-07-29 16:32:05 -04:00
Naomi 16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
denise 7d70a5ed28 Deleting show code improvement. 2013-07-29 15:13:47 -04:00
denise ff557ec75f CC-5283: Calendar gets messy, possibly after upgrade 2013-07-29 15:10:24 -04:00
denise 1046a0916d CC-5289: Exception about linked show in zendphp.log 2013-07-29 14:13:56 -04:00
Naomi Aro c0206ff8f4 CRLF 2013-07-29 08:59:04 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS.
working on configuring a template.
2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
Naomi Aro c7b5592fa9 starting to populate with the template. 2013-07-26 11:36:58 -04:00
Naomi ecb2f81211 creating an new row for edit/delete links in the datatable
working on creating/editing records.
2013-07-23 18:01:43 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi 1abbe85d6d IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature

dos2unix fix
2013-07-03 16:02:17 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature

moving original functionality into the service.
2013-07-03 16:00:48 -04:00
Naomi 9f7e85b273 IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:20:40 -04:00
Naomi 328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
drigato f82cb364c1 CC-5246: Calendar: ON AIR show has an incorrect context menu 2013-06-20 15:21:33 -04:00
drigato 28d73264da CC-5240: Overnight Linked Shows, newly generated not getting content 2013-06-19 01:17:32 -04:00
denise b95a0d7c4a CC-5241: deleting a linked show, show comes back in the schedule 2013-06-18 16:56:16 -04:00
Martin Konecny 2a0c9769aa Merge branch '2.4.x'
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	python_apps/pypo/liquidsoap_scripts/fdkaac.liq
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/telnetliquidsoap.py
2013-06-14 16:45:52 -04:00
denise 3f1c47b764 CC-5215: Linked shows sometimes lose crossfades 2013-06-07 13:47:12 -04:00
denise eaf337f317 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:30:24 -04:00
drigato 66af5cddd9 Trying things 2013-06-07 11:30:13 -04:00
denise f4aba1a189 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:29:45 -04:00
denise 02ca82f85e CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:17:35 -04:00
drigato bef2dc190e Trying things 2013-06-07 11:17:35 -04:00
denise ccb3da3192 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:17:35 -04:00
denise 59c68569ab CC-5208: DJ can try to edit show not assign to him 2013-06-07 11:17:35 -04:00
Naomi 99cc75ef51 users can open the current show to schedule and also rebroadcast shows. 2013-06-07 11:17:35 -04:00
denise bad5b12472 CC-5208: DJ can try to edit show not assign to him 2013-06-05 12:05:41 -04:00
Naomi 12302aa1dc users can open the current show to schedule and also rebroadcast shows. 2013-05-31 11:42:35 -04:00
denise f28ab12281 Fixed typo. 2013-05-31 09:40:23 -04:00
denise 3f97b071fe CC-5187: Edit show -> disable linking option if show is currently playing 2013-05-30 11:06:45 -04:00
denise e2810606ab CC-5186: Edit current playing show throws exception sometimes 2013-05-29 14:24:29 -04:00
denise d00f8392bb CC-5183: Use of undefined variable 2013-05-29 12:34:00 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table.
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
drigato 96ac9cb534 CC-5174: Linked Show: Update a regular show to linked show will move the whole scheduled time forward. 2013-05-24 09:43:03 -04:00
denise 0107f36206 Changed propel to prepared statements 2013-05-23 12:49:15 -04:00
denise d57836c42b CC-5159: Repeating Shows doesn't populate correct dates sometimes 2013-05-17 13:10:15 -04:00
denise 9133384789 is_scheduled flag was not getting updated when shows were deleted 2013-05-16 15:03:10 -04:00
denise f3edc2bee6 CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
Fixed so it doesn't update files that are scheduled in other shows
2013-05-15 12:38:48 -04:00
denise 254ebb709e CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library 2013-05-15 11:25:30 -04:00
denise c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
denise 9377e21293 Removed unnecessary function call when editing a show 2013-05-14 08:59:21 -04:00
denise 13458ad687 CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents 2013-05-10 14:17:54 -04:00
denise fe88e6249a CC-5093: Please disable link option for recording show 2013-05-08 15:08:56 -04:00
denise 9dbec4636a CC-5106: Calendar: Context menu "Show contents" is missing for past shows 2013-05-08 13:43:27 -04:00
denise d8ba15fac4 CC-5091: Linked Show: Cannot change the start time ahead 2013-05-08 12:05:45 -04:00
denise 22b74126f9 CC-5087: Repeating show -> Same day by Month: Time slot of repeating instances aren't correct 2013-05-07 16:16:32 -04:00
denise fac96996e3 CC-5084: Repeating show edited to linked doesn't add content to repeat instances
Fixed. If the each repeating instance has different content, we replace it
with the first instance's content
2013-05-03 11:37:11 -04:00
denise 0e5ba2f07f CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost 2013-05-02 15:36:14 -04:00
denise ea73d98c49 CC-5075: Future bi-weekly linked shows don't get filled with content sometimes 2013-05-02 11:40:56 -04:00
denise 09754b20cc CC-5082: Repeating shows "disappear" when switching calendar to next month
This was caused by the calendar trying to re-create single instance shows.
We needed to exclude non-repeating shows when populating the calendar with repeat events
2013-05-01 15:20:55 -04:00
denise 3d61a18261 CC-5082: Repeating shows "disappear" when switching calendar to next month
Small fix. Was treating object as an array
2013-05-01 14:42:53 -04:00
denise ded8ceb86b CC-5082: Repeating shows "disappear" when switching calendar to next month
We were trying to call a function on an object that was not set
2013-05-01 14:40:33 -04:00
denise 0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -04:00
denise ec2f36efa8 CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances
- We weren't updating the time_filled column in cc_show_instances when creating the new show
2013-04-30 15:54:04 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -04:00
denise 1384c5d39d Function call was missing an argument 2013-04-29 15:57:59 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise cfee74693b CC-4961: Show linking
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
denise 81dbb17922 CC-4961: Show linking
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 1eba09fc4c Show linking 2013-03-28 16:19:05 -04:00
denise d0691b114c Show linking 2013-03-28 14:25:40 -04:00
denise 731b86b36c Added back editing a repeating show instance feature 2013-03-27 16:25:39 -04:00
denise e259639d1a Removed scheduleController private variable, currentUser
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
denise 230d1a6aa9 Fixed bug where shows weren't populating when moving forward in the calendar 2013-03-26 10:33:06 -04:00
denise ef8f87df5d Show linking 2013-03-25 16:28:53 -04:00
denise 5b69761833 CC-4961: Show linking
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
2013-03-25 13:48:11 -04:00
denise 327d0dd6c9 CC-4961: Show linking
Add front-end for creating a show with monthly repeats on same day of week
2013-03-22 15:57:15 -04:00
denise 187e49e4b2 CC-4961: Show linking
Added back-end functionality for creating monthly repeating shows on
the same day of the week
2013-03-22 14:57:02 -04:00
denise 6766d208aa CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise a7601d290f CC-4961: Show linking
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
denise bae9f1202a CC-4961: Show linking
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
denise 4bdd89f747 CC-4961: Show linking
Fixed edit show start/end time bug
2013-03-18 12:34:27 -04:00
denise 896e03d76b CC-4961: Show linking
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
denise 5735baf237 CC-4961: Show linking
Made progress on ShowInstanceService
2013-03-13 11:08:16 -04:00
denise f9f4e4f1fb CC-4961: Show linking
Made some progress on show editing
2013-03-12 18:01:12 -04:00
denise 438200425a CC-4961: Show linking 2013-03-12 11:33:32 -04:00
denise c721b81a13 CC-4961: Show linking
Refactoring
2013-03-12 10:30:31 -04:00
denise 7347be35b1 Created a new service for show days
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
denise d8ced29dd0 Refactored adding show forms to the view 2013-03-08 16:08:43 -05:00
denise 5111f74494 Created function to set the next populate until date for repeating shows 2013-03-08 12:17:55 -05:00
denise 9be6b82d97 Fixed rebroadcast date bug 2013-03-08 12:06:45 -05:00
denise 846e940f82 Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking
Conflicts:
	airtime_mvc/application/services/ScheduleService.php
	airtime_mvc/application/services/ShowInstanceService.php
	airtime_mvc/application/services/ShowService.php
2013-03-08 11:24:54 -05:00
denise 4a86da5f87 Created function to create repeating show instances
Created function to create rebroadcast show instances
2013-03-08 11:19:03 -05:00
denise af622eb4b8 CC-4961: Show linking
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
denise c29e11fa0f Created empty showInstance service.
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-03-06 09:58:35 -05:00
denise d497cfa857 Created show service 2013-03-06 09:58:35 -05:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
denise c7203aa40d CC-4961: Show linking
Refactored some more show instance creation functions
2013-02-26 17:41:35 -05:00
denise 8c8a7d11e1 Created empty showInstance service.
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-02-26 13:21:39 -05:00
denise 2717c0845b Created show service 2013-02-26 10:20:02 -05:00
denise 9f0baba4f8 - Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
2013-02-25 17:31:43 -05:00
drigato 3e49421221 Added comments to Schedule Service 2013-02-25 09:15:03 -05:00
denise 22f52ca195 CC-4961: Show linking
-initial schedule service experimentation
2013-02-21 17:57:56 -05:00