Commit graph

2093 commits

Author SHA1 Message Date
James Polley
f99765ca0b Add admin action to update slot names
* The slot object updates its name every time it is saved
* But sometimes its slotrooms are changed underneath it, and so the
  name can become out of date
* This method is a simple way of updating the names for all the slots
2018-01-10 22:27:55 +11:00
Christopher Neugebauer
9a25ca1754 Chrisjrn/session chair (#94)
* Adds session_detail page

* Adds session chairing information to the schedule grid

* Adds session_list.html

* Nicer volunteer text

Conflicts:
	pinaxcon/templates/symposion/schedule/_grid.html

Conflict and migration performed by Sachi King <nakato@nakato.io>
Emoji changed, lca2017_tags to lca2018_tags, remove needless dependency
on django-user-account, use request instead like the remainder of the
calls n the template do anyways.

Remove blocktrans from a number of texts as they break {{ templating }}
and we don't translate anyways.

Modified-by: Sachi King <nakato@nakato.io>
2018-01-10 20:28:22 +11:00
James Polley
23f4a38126 Add filter on room to Slot admin 2018-01-10 15:58:36 +11:00
James Polley
c15848bfce Fix off-by-one errors in ticket categories 2018-01-09 04:29:00 +00:00
James Polley
d30852e5f1 Attach qrcode as attachment 2018-01-07 23:15:46 +11:00
James Polley
0831a4aa76 Add support for a "ready for boarding" group
This allows for the boarding functionality to be safely tested with
just a subset of users first. Once you're ready to go live Fur Reals,
just delete the group and all users will become eligible.
2018-01-07 22:27:15 +11:00
James Polley
c478fb8454 Update badge template 2018-01-07 17:45:33 +11:00
James Polley
e726ff21a8 Create regidesk app
Shows summary of all attendees with a paid ticket, including
boarding_pass status.

Currently, regidesk allows staff with the requisite permission the
ability to view the checkin status of attendees, and email the user
their boarding pass email.

Included is a view for the user to retrieve their own QR code (in case
they got the plain-text version of the email, they can use this to
download an image to their phone for faster checkin)
2018-01-06 11:38:06 +11:00
James Polley
44cdd088be git subrepo clone git@gitlab.com:LCA2018/registrasion-desk.git vendor/regidesk
subrepo:
  subdir:   "vendor/regidesk"
  merged:   "a8096d0"
upstream:
  origin:   "git@gitlab.com:LCA2018/registrasion-desk.git"
  branch:   "master"
  commit:   "a8096d0"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2018-01-06 11:38:04 +11:00
James Polley
79743b711d More consistent color-coding for talk status buttons
- there's no btn-default, switch that to btn-primary
 - consistently use info for standby, primary for undecided, success
   for accept and warn for rejected
2018-01-06 11:38:04 +11:00
James Polley
2465f2645e urlize abstracts
I've looked through the database and I can't find any accepted
proposals that actually contain anything to linkify - but I've had
several requests from people that I think are reasonable, things like
being able to link to their project (we ask them to provide a project
url but we don't use that link)

This seems like a reasonably fast way to let those people add a
link. We still have to manually accept changes to their proposal so we
have a chance to look at the content of the url if we want.

The urlize filter adds rel=nofollow to the link automatically.
2018-01-04 21:31:00 +11:00
James Polley
1fd8364456 Modify limits report to include category inclusions as well
* A TimeOrStockLimit limit can apply a limit to a whole category, or
  to specific products
* This report was only counting the products directly listed
* Take advantage of the new all_products property to include the
  products indirectly listed as well as those directly listed
2018-01-02 12:53:14 +11:00
James Polley
6a9652dfd2 Add an all_products property to FlagBase
It's common to need to query the fill list of products covered by a
Flag - whether directly, or by being in an included category.

Add an all_products property which does this.
2018-01-02 12:53:14 +11:00
James Polley
0e1038de97 Add ticket_type property to Attendee
This vastly simplifies templates and many many things which need to
look this up.
2018-01-01 16:22:04 +11:00
James Polley
eac35f3604 Add a button class so that the button gets drawn 2017-12-31 17:23:54 +11:00
James Polley
9dc2ea4439 Voucher form needs to be processed first
Because otherwise, the firstform (which will not be in a valid start)
throws errors which prevent the voucher form from ever being processed.
2017-12-31 17:23:42 +11:00
James Polley
d4ca04bada * Fix categories for badge icons, company names
* Company names had a misspelled filter and weren't being displayed
* Add some conditional logic so that company names don't get shown for
  hobbyists or students
2017-12-27 02:51:57 +11:00
James Polley
f6768e19d8 Make our fonts available to the system
To make them more useable by cairo
2017-12-27 00:20:47 +11:00
James Polley
f675580d6b Add support for badge PDFs also
* Add a greyscale filter to text for more accurate preview
* Always default to SVG preview as it's the most accurate (cairo
  doesn't do a great job of handling custom fonts when it converts to
  png/pdf)
* Always use roboto font.
2017-12-26 23:55:09 +11:00
James Polley
fcbacc82e6 Add views to allow for PNG rendering of badge 2017-12-26 23:10:21 +11:00
James Polley
469e6f1ad9 Add a butotn so users can preview their own badge 2017-12-26 21:05:03 +11:00
James Polley
d14048bcb8 Further changes to support badge generation for lca2018
* Undo some of the debugging done early in this series of patches
* Add ability for a user to preview their own badge
* Add a template for the LCA2018 badge
2017-12-26 21:01:40 +11:00
Sachi King
9ab075e51c Badges work by copy-pasting lca2017/pyconau2017 code around
WIP - Push for share
2017-12-26 04:24:20 +00:00
James Polley
25bff81eab Revert "Fix off-by-one error in rowspan calcuations"
This reverts commit 96a24489b6.
2017-12-25 21:44:31 +11:00
James Polley
f69e7ac52d Add a box to point people at account management 2017-12-25 17:08:11 +11:00
James Polley
96a24489b6 Fix off-by-one error in rowspan calcuations 2017-12-24 19:20:14 +11:00
James Polley
b833b7d869 Order slots by room order first
* lca2018 has a situation where we have multiple slots starting at the
  same time, but ending at different times
* The headers of the timetable grid are sorted by room sort order
* In sqlite at least, ordering by start,order seems to implicitly
  resolve duplicate start times by looking at the other sort fields
  first, and will only sort on order if all other fields are identical

* This results in the slot that ends first going in column 1, which
  gets out of sync with the room listed in the header

* I can't figure out how to solve this in the database, so...

* Force the slots to be sorted by room order.
* Then, for each start_time, select out slots starting at that time
  and operate on them
* This both gets the slots in the right order *and* keeps multi-room
  slots with the right colspan. Yay!

* It's possible that this wouldn't be needed on some DBs which might
do the sorting differently.
2017-12-24 19:20:04 +11:00
James Polley
f07246f9d5 Display Room for everything that's not break
Talks, tutorials, plenaries, miniconfs - everythign except breaks please.
2017-12-24 14:50:59 +11:00
James Polley
193ffc76d5 List rooms in slot admin
In many parts of the schedule there are multiple slots with the same
start/end times, and it can be hard to find the one you want to edit.

Make this slightly simpler by listing the room names in the admin list.
2017-12-24 13:54:57 +11:00
James Polley
cabad1c7d5 Change "Apply voucher" button into a link
I can't find the form that should be displayed here, so the simplest
thing I can do at 11pm is to make this a link. That's unsatisfying but
hopefully works.
2017-12-23 23:05:56 +11:00
James Polley
98fe425867 Tidy presentation of discounts list 2017-12-23 21:52:58 +11:00
Sachi King
5511a3d00a str values before bleach
Can't operate on objects, stringing seems fine here, there's a lot else
already randomly str() before bleach.
2017-12-23 04:16:36 +00:00
Sachi King
66224d6834 Make Emoji-capable fields greyscale 2017-12-23 02:27:40 +00:00
James Polley
2aae2af55d Disable client-side validation on credit_note forms
* HTML5 browsers have some clevers to do client-side validation of
  forms
* Django activates this by default for certain field types
* However, in this case, there are three forms on this page. We rely
  on two of them being invalid in order to figure out what processing
  to do.
* So we need to disable the client-side validation.
2017-12-23 13:13:43 +11:00
James Polley
2e07fbeac5 Remove unicode warning
We now support more unicodes so remove the warning
2017-12-23 12:56:33 +11:00
James Polley
3ac31dd55b Include templates in sdist
Adds a MANIFEST.in to ensure that templates are included in the built
package and thus available in systems that install this package.
2017-12-23 12:29:37 +11:00
James Polley
fcfdb10ede Display Condition type in list views
* Whether a Flag is disable-if-false or enable-if-true is a very
  important detail
* But one that's easy to get wrong
* And it's hard to spot problems without inspecting every single flag

This change adds the Condition into the various admin list views, so
that it's easier to scan them all for problems and look for inconsistencies.
2017-12-22 18:43:02 +11:00
James Polley
d19e34280a Enhance proposal fields display
* Display the "withdrawn" status
* Display extra information about exhibitions for art+tech
2017-12-13 12:03:12 +11:00
Joel Addison
21e06deef0 Fix navbar dropdown menu colour and font size 2017-12-10 17:55:41 +10:00
Joel Addison
9f0bb9178f Improved menu styling
Update menu to use same style as static site,
with slight adjustments for Bootstrap 3.
2017-12-10 17:26:38 +10:00
Joel Addison
00ea909d05 Update fonts
Use the same fonts as the static site, as per the LCA2018 branding guide.
Shrink headings on the Dashboard to suit new fonts.
2017-12-10 17:26:38 +10:00
Joel Addison
bd25446f6e JavaScript fixes 2017-12-10 17:26:38 +10:00
Sachi King
cb51a2abd8 Tell django to use MB4 2017-12-10 14:31:48 +11:00
James Polley
a880bc27fb Enhance track admin 2017-12-03 18:11:39 +11:00
James Polley
c7e29b3cb1 Don't try to initialise dataTable twice
Old code was initialising the dataTable twice - once in the parent
block and once in the child. This doesn't actually work and just
caused errors.

Switch to only initializing it once. Unfortunately this creates
copy-pasta :(
2017-12-03 17:30:43 +11:00
James Polley
3239bbe29a Don't duplicate existing rooms when importing schedule CSV
* Old implementation needs to see exactly the same rooms in exactly
  the same order every time it loads new data, otherwise it will
  create a duplicate entry for the room that differs only in display
  order.
* New implementation ignores the display order when checking to see
  if the room already exists.
2017-12-03 16:15:19 +11:00
James Polley
cfc19f309f If there are no track names for today, don't show the row
If there are track names today, show the row for track names. If there aren't, don't show an empty row.
2017-12-03 15:36:06 +11:00
James Polley
bc3edb80d9 Point static urls to the build dir rather than src dir 2017-12-03 14:49:37 +11:00
James Polley
233818c33b Set width to avoid Firefox rending icons very large 2017-12-01 16:14:59 +11:00
James Polley
4f37556db0 Only copy visible columns on attendee reports
Also, add the ability to choose which columns are visible.
2017-12-01 12:22:42 +11:00