330828fbdd
Refactored sql substition into pdo
2012-09-04 13:52:33 -04:00
27ea00f5d4
Refactored sql substition into pdo
2012-09-04 13:50:13 -04:00
a731fc147b
CC-4348: Prepared statements - part 4
...
-fixed Show.php
2012-09-04 13:34:05 -04:00
4848717d4d
CC-4090: Make code style PSR compliant - part 4
...
-models dir
2012-08-29 10:58:03 -04:00
5443c1931a
CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view
...
-fixed
2012-08-24 15:27:04 -04:00
462542bf68
change Logging::log to Logging::info
2012-08-21 18:41:56 -04:00
64a36ea21a
cc-4240: fixed
2012-08-21 16:33:37 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
e20289e5cf
Merge branch '2.1.x' into devel
2012-08-06 17:17:05 -04:00
975abbaf10
Remove unecessary information being sent from API
2012-08-06 17:16:43 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
255866d240
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
aaa0c01e01
CC-4120: memory optimizations for calendar page.
...
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
4ebcb1b1f9
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
63856ea918
CC-4079: Apache error: missing $startDt variable
...
- fixed
2012-07-06 15:40:16 -04:00
f188eeada2
preparation for 2.1.1 release
2012-06-13 11:35:14 -04:00
02b6d04952
CC-3956: PHP script can enter inifinite loop
...
-small cleanup
2012-06-12 20:18:06 -04:00
b858c34526
CC-3956: PHP script can enter inifinite loop
...
-fixed
2012-06-12 18:51:22 -04:00
62eee61d4e
CC-3956: PHP script can enter inifinite loop
...
- fixed
2012-06-08 17:58:21 -04:00
e661f400a4
CC-3950: apache log errors part2
...
- fixed
2012-06-08 15:31:45 -04:00
3566480999
CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
...
-fixed
2012-06-05 11:19:59 -04:00
80998f2eac
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:19:06 -04:00
28a383e960
- fixed check for currentShow's end boundary to only be greater than current time
2012-05-23 16:18:59 -04:00
a969599986
CC-3858: Record and Rebroadcast Creation Problem\
...
- fixed
2012-05-23 14:55:55 -04:00
164c158c80
CC-3859: Playout History: Filter out songs that are not played out
...
- done
2012-05-22 17:39:27 -04:00
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02:00
42f75634fc
CC-3854: Crash on Adding Show
...
-fixed
2012-05-18 18:57:22 -04:00
9967f5451c
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
6695e3e190
-fix javascript error in widgets
2012-05-15 14:35:01 -04:00
4b03a45d46
CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
...
-fixed
2012-05-15 14:20:53 -04:00
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
000f7d549c
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- fixed a bug where variable name wasn't changed
2012-04-18 12:25:10 -04:00
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
8a34023336
CC-3465: Now playing should show tracks over shows for previous and next
...
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
a65ea6d058
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
2012-03-13 17:46:13 -04:00
1e4d34447a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-03-13 10:23:44 -04:00
cbaeda1d6b
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
- if the previous track is null the previous show is sent back as an example of the algorithm.
2012-03-13 10:21:01 -04:00
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
0f9800a6bd
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
2012-03-01 14:59:06 +01:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
a1e8903a64
CC-3174 : showbuilder
...
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
8bbccb6f44
CC-3338: Optimize week display
...
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
2012-02-22 14:32:59 -05:00
54cbc86a0a
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Nowplaying.php
airtime_mvc/application/models/Show.php
airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
3df396756f
CC-3323: Don't send description text to Full Calendar since it is never used.
...
-Done
2012-02-13 12:10:23 -05:00
941da1fe44
CC-3174 : showbuilder
...
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
a69be24831
CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
...
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
9275b21f48
CC-3177 : editing a show in the calendar brakes show edit form
2011-12-13 11:10:04 +01:00
72952024b7
CC-3177 : editing a show in the calendar brakes show edit form
...
will only update shows if the duration is 24:00 or less.
2011-12-12 12:11:31 +01:00
73c0408315
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-05 12:56:16 -05:00
efbaebbbf5
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-02 16:22:54 -05:00
966dd49610
CC-3094 : Rebroadcast editing problems
2011-12-02 16:24:11 +01:00
198340ac67
CC-3094 : Rebroadcast editing problems
2011-12-02 13:31:54 +01:00
878fa3461d
CC-3094 : Rebroadcast editing problems
2011-12-02 12:06:09 +01:00
f1e1b747ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 13:32:05 +01:00
5828b2037d
CC-3102 : Show Editing, how it uses day of the week
2011-11-26 13:31:42 +01:00
b16fa16042
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 00:06:29 -05:00
317bed8643
CC-3094: Rebroadcast editing problems
...
-Fixed
2011-11-26 00:06:17 -05:00
41eeefe427
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-25 21:34:05 -05:00
f03b875e06
CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top
...
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.
Fixed by checking modified_instance column; only return it if modified_instance != TRUE
2011-11-25 21:33:42 -05:00
c21cbeb73b
CC-3102 : Show Editing, how it uses day of the week
2011-11-25 16:07:03 +01:00
b84c51212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-24 14:05:38 -05:00
276607c302
CC-3104: Timezone issues in the widget
...
For a previous ticket, I changed the code so that both "Today's Program" widget
and "Now Playing" widget both use the liveInfoAction, but forgot that for "Now Playing" widget, it retrieves
the shows within next 48 hours instead of within end of day today...
Fixed by passing GET parameters to liveInfoAction, specify whether we want to retrieve shows within an
interval or end of day. Also added a GET parameter for specifying the number of shows to display.
2011-11-24 13:54:58 -05:00
40b99dfc0f
CC-3085 : Repeating shows get added to the wrong days
2011-11-24 19:39:08 +01:00
54ef9f2b03
CC-3102 : Show Editing, how it uses day of the week
...
not sure if this change should be here anymore yet.
2011-11-24 17:10:49 +01:00
e68d7afa3f
CC-3102 : Show Editing, how it uses day of the week
2011-11-24 16:20:17 +01:00
5c7828c1f5
CC-3102 : Show Editing, how it uses day of the week
2011-11-24 11:56:24 +01:00
87886b039f
CC-3083 Must convert to UTC start/end times using the timezone start/end times
2011-11-23 19:11:48 +01:00
685e5e03c4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-23 18:49:13 +01:00
65fb00ad8d
CC-3083 Must convert to UTC start/end times using the timezone start/end times
2011-11-23 18:47:44 +01:00
212205b0ff
CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days
...
-fixed.
2011-11-22 18:03:47 -05:00
ac74ca2449
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-21 18:04:19 -05:00
86729475f6
CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone
...
- Converting times to UTC timezone in ApiController before sending them to model functions
- Added utility functions in DateHelper.php
- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
2011-11-21 18:03:56 -05:00
21bbb983ac
CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone
...
-fixed
2011-11-20 14:46:01 -05:00
9ab47d5eba
CC-3036: Deleted Show instances reappear
...
-Renamed deleted_instance to modified_instance
2011-11-18 12:20:25 -05:00
f3e1f63226
CC-3060: Apache errors: Undefined index: deleted_instance
...
-fixed
2011-11-18 11:59:15 -05:00
4f2adc3068
CC-3050: Comb through source code for dates being generated with date() function
...
-done
2011-11-16 14:06:59 -05:00
a5939afd3f
-fix minor typo
2011-11-16 12:59:01 -05:00
1e79363263
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-16 12:35:44 -05:00
17e59f61be
CC-3036: Deleted Show instances reappear
...
-Make sure we ignore deleted show instances in
all areas of Airtime.
2011-11-16 12:35:02 -05:00
12172e5ad5
CC-3035 : Should be able to resize a show, have it affect all future instances of the show
...
added a new resize function to Shows.php,
should not use ShowInstance resize method, since you cannot resize just one instance currently.
2011-11-16 16:32:04 +01:00
e5fc5d623d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/DateHelper.php
airtime_mvc/application/models/Show.php
2011-11-15 16:14:00 -05:00
a0217f715f
CC-3037: Nowplaying bar not showing current show
...
-fixed
2011-11-15 16:10:45 -05:00
4bdf866aca
CC-3035 : Should be able to resize a show, have it affect all future instances of the show
...
resizing is only working for single instance currently like the past.
2011-11-15 18:22:21 +01:00
63d0163f15
CC-3047 : getting full calendar events setting editable flag incorrectly
2011-11-15 16:32:07 +01:00
61d8fa7baa
CC-3034 Record/Rebroadcast Shows have time problems
...
fixing some UTC to non UTC comparisons,
adding offsets properly to create a rebroadcast show's start/end time.
2011-11-15 15:20:33 +01:00
e3395ae1e5
CC-3036: Deleted Show instances reappear
...
-done.
2011-11-14 23:54:47 -05:00
20fc49b7be
CC-3027: Current Show progress bar is wrong
...
-looks like it's working.
2011-11-12 00:04:37 -05:00
1a45a38055
-add function comments to Show.php
2011-11-11 22:55:46 -05:00
42cde33648
CC-3030: Repeating shows is broken in devel branch.
...
-working towards using only DateTime objects
2011-11-11 17:25:49 -05:00
74d3c3aebc
CC-3030: Repeating shows is broken in devel branch.
2011-11-11 10:58:27 -05:00
b04b7ff010
CC-2848: Misc bugs from demo service
...
- Handling concurrency issue playlist section and show(canlendar) section
2011-11-10 15:35:27 -05:00
6ffecf80c8
CC-2965: Frontend widget displays shows in UTC time
...
Not only were frontend widgets showing UTC time,
the SQL query was also comparing UTC timestamp with local timestamps,
causing widgets to display shows in the wrong day, etc.
Another problem was that "On air today" widget was simply calling
GetNextShows which returns shows within next 48 hours.
Fixed by:
1. Under models/Show.php:
In the GetCurrentShow/GetNextShows/GetShowsByDayOfWeek functions,
added code to convert UTC timestamp to local timestamp or vice versa,
depending on which one is more suitable, in SQL queries, thus
removing inconsistency in timezones. Also, before returning query result,
added code to convert result to local timezone.
In GetNextShows, added an optional parameter endTime to limit the interval
of shows to get. This is useful for the "On air today" widget.
2. Under models/DateHelper.php:
Added a few timezone functions to help converting timezones easier in Show.php.
3. Under controller/ApiController.php:
Added todayInfoAction which is to be used by "On Air Today" widget.
2011-11-04 16:57:24 -04:00
d26e410799
CC-2997: Daylight savings time affects repeating shows.
...
-should work now
2011-10-25 16:49:44 -04:00
08b97c4583
CC-2991: Repeating a show is broken
...
-working
2011-10-24 17:26:45 -04:00
04b88d4344
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-24 16:59:16 -04:00
858990eb8c
CC-2991: Repeating a show is broken
2011-10-24 16:58:55 -04:00
a65fb97aec
CC-2986: Long show description causes Add Show or Edit Show to fail silently
...
Added StringLength validators for the UI fields. This way when user gave more than what
they should gave as the input, it's going to display an error msg.
The maximum length for the fields is queried from the database before the
fields were initialized.
2011-10-24 13:27:53 -04:00
20e9002310
CC-2956: Undefined variable: endDateTime in
...
/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule
- fixed
2011-10-11 16:36:01 -04:00
9e6a1ebf44
CC-2833: Use ClassLoaders for PHP Files
...
-autoload DateHelper class
2011-09-26 15:29:12 -04:00
dfe43c98bb
CC-2833: Use ClassLoaders for PHP Files
...
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
e60db9e031
CC-2860: When recording a show, UTC time is displayed on the
...
text field of right progress bar.
2011-09-23 15:37:45 -04:00
1dd78d0584
CC-2833: Use ClassLoaders for PHP Files
...
-Found out ClassLoaders only want one class per file. Moved
ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
2011-09-23 12:33:28 -04:00
693c72c396
-change Shows.php to Show.php
2011-09-23 10:56:12 -04:00
Rudi Grinberg
Martin Konecny
denise
James
Naomi Aro
paul.baranowski
Daniel
Martin Konecny
Yuchen Wang
Yuchen Wang
Martin Konecny