Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ericg/enhanced sort #41

Merged
merged 5 commits into from Jul 1, 2019

Conversation

Projects
None yet
2 participants
@eric-gilbertson
Copy link
Collaborator

commented Jun 28, 2019

17: add reivewer name and sorting to A file tables
- add reivewer column
- use jquery.tablesorter for client side sorting
- shorten long nav panel links
- widen main table div
- remove redundent date table from a file listing
- shorten long functions
- use single quotes for class names
- reduce nav pane width and increase content width

  • use edit pencil for A file edits
  • reduce tablesorter header padding

eric.gilbertson and others added some commits May 20, 2019

eric.gilbertson
#6 - timestamp playlist inserts when adding to a live showEndTime
add timestamp to track inserts on playlist if show is realtime, eg
insert is done during the user specified begin/end times. also simplify
markup generation by breaking large functions up and by using CSS to
reduce the amount of required markup. other changes include:

  - show time in 12 hour format
  - show album & artist names as 'first last' (was 'last, first')
  - remove the butt ugly heart logo
  - simplify playlist banner
  - add playlist CSS classes
  - normailize border width
  - add border between playlist header and body
  - improved track edit glyphs
  - replace \" with ' for readability
  - update zkdbSchema.sql and provide an upgrade script
  - protect against empty arrays in for loops (generate ugly warning messages)
  - make album link clickable in playlist edit mode (now matches view mode markup)
  - added 'created' to tracks query (as last column in the select statement)
  - added function to check if insert is within show start/end times
eric.gilbertson
17: add reivewer name and sorting to A file tables
    - add reivewer column
    - use jquery.tablesorter for client side sorting
    - shorten long nav panel links
    - widen main table div
    - remove redundent date table from a file listing
    - shorten long functions
    - use single quotes for class names
Merge pull request #1 from RocketMan/master
merge with upstream
eric.gilbertson
17: add reviewer name and client side sorting to A file tables
   - reduce nav pane width and increase content width
   - use edit pencil for A file edits
   - reduce tablesorter header padding
   - insure that tablesorter JS is always invoked
   - add missing jquery import
@RocketMan
Copy link
Owner

left a comment

Thanks Eric! This adds a lot of value to the A-File for DJs as they plan their shows.

There are a few things that are broken or otherwise need adjustment; I have included comments in-line.

There were also some things that were actually git's inability to merge previous upstream changes properly. I could have fixed those, but call them out here so you can fix them in your repo as well.

Please make the changes and push to your branch on github. The changes should automatically show up in the PR.

Thanks again!

Show resolved Hide resolved config/config.kzsu.php Outdated
Show resolved Hide resolved css/zoostyle.css
Show resolved Hide resolved css/zoostyle.css
Show resolved Hide resolved db/convert_v2_to_v3.sql Outdated
Show resolved Hide resolved ui/Main.php Outdated
Show resolved Hide resolved ui/AddManager.php
Show resolved Hide resolved ui/AddManager.php
Show resolved Hide resolved ui/AddManager.php
Show resolved Hide resolved ui/AddManager.php Outdated
Show resolved Hide resolved ui/AddManager.php
@RocketMan

This comment has been minimized.

Copy link
Owner

commented Jun 28, 2019

Github also does this annoying thing of hiding some code review comments. Why, I have no idea. The page will say something like '7 hidden conversations, load more...' You have to click on those links any time you see them.

eric.gilbertson
update per comments from jim
   - show disk categories as a string
   - Contact Us -> Submit Music
   - remove merge terds
   - remove unnecessary server side A file sorting
   - remove show tag logic
   - show reivew iff user logged in
   - restore print link
   - tighten up table vertical spacing
   - show logged in user's name
   - fix Activity table header names
   - support jquery import with https

@RocketMan RocketMan merged commit 7c0c9cf into RocketMan:master Jul 1, 2019

@RocketMan

This comment has been minimized.

Copy link
Owner

commented Jul 1, 2019

Thanks Eric, everything was addressed and looks good.

I've merged to upstream and deployed to stage. Please compare to production to ensure no regressions.

As well, I updated the reviewer to use the display surname and made some other minor tweaks. Please be sure to pull in from upstream to pick these up.

One thing, I notice that the 'No playlist' entry on the A-File Activity page is missing. Is this intentional? This entry is for the PD to quickly identify DJs who do not enter playlists. I am not sure this is so much a thing anymore, but it's worth checking with the PD team, if its removal is intentional.

Cheers
-Jim

RocketMan added a commit that referenced this pull request Jul 7, 2019

A-File enhancement fixes
Miscellaneous fixes for #41 A-File enhancements, including #43 and #44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.