Commit graph

2171 commits

Author SHA1 Message Date
James Polley
837ecc33b5 Update requirements to latest bleach and pytz 2018-06-06 12:22:00 +10:00
James Polley
c8218bb9d0 Correct variable name to reflect what it's naming
IT's not the container name, it's the image name. Fix the name to be
less confusing.
2018-06-06 12:21:26 +10:00
James Polley
ddae8d91f6 Improved handling of static/build and css generation
When the container is mounted, the local contents of . obscure
/app/symposion_app in the image.

Generally speaking, this is handy for development, as it means that
local changes are detected and used immediately without needing to
restart the container.

However, it breaks in the specific case of the sass->css
generation. Prior to this change, the css is generated only after the
first time a page is hit. The generated file is placed in
static/build; however, due to the obscuration, this generated file
isn't visible to the running process.

The next time the container is built, the pre-existing static/build
directory is copied into the container as it's being built; then,
later, that version is what gets served.

This change adds the needed libraries to pre-generate the css as part
of the image build, and runs compilescss to do this, prior to the
collectstatic step.

It also adds a second collectstatic into the make_dev_container
script, so that the visible static/build directory should ahve the
same contents as the obscured static/build directory. It also expands
the .dockerignore file to make sure these files aren't copied into the
image in future.

I'm not sure if this is the right thing to do, as changes to this
directory will be ignored, which could be confusing. Perhaps never
being able to see these generated files is better?
2018-06-06 12:20:06 +10:00
James Polley
3d9c8b3032 Merge commit 'c07dc66' into tobi/2019_layout 2018-06-05 16:59:13 +10:00
Tobias Schulmann
80dac1a769 Quick todolist writeup 2018-06-04 20:55:04 +12:00
Tobias Schulmann
4d15cbf85c Add first 2019 design attempts 2018-06-04 20:54:51 +12:00
Tobias Schulmann
da2bacdfa7 Add bootstrap4 copy 2018-06-04 20:54:30 +12:00
Tobias Schulmann
c9449f619d Make homepage the default route 2018-06-04 20:54:10 +12:00
Tobias Schulmann
ad05ca50a0 Add static assets 2018-06-04 20:53:14 +12:00
Tobias Schulmann
3daf623360 Add sass processor 2018-06-04 20:52:51 +12:00
Tobias Schulmann
44cc0e356f Update fixtures for LCA2019 2018-06-04 20:51:03 +12:00
Sachi King
c07dc66b3d Attempt updated CI deployment 2018-05-26 14:47:19 +10:00
James Polley
1402c76540 Pull Dev image from 2019 base 2018-05-26 12:18:33 +10:00
James Polley
bf1f42dab9 Modify dependencies to suit debian stretch
The python:3.6 tag now points to stretch.

Changed the name of the base image to make this more explicit.
2018-05-26 11:56:24 +10:00
James Polley
bbd277c462 Modify build pipeline for 2019 dev branch 2018-05-26 11:43:25 +10:00
James Polley
a0c6dffd87
If symposion-tools is found, back up the db 2018-04-19 08:02:43 +10:00
James Polley
b366c7809e
Create review permissions on dev image build 2018-04-19 07:41:51 +10:00
James Polley
9d60934153
Rename 2019 deploy job to not clash with ticket-testing deploy 2018-04-19 07:41:22 +10:00
James Polley
f3adee261c
Don't populate inventory yet
We'll turn this back on once we're ready to start testing inventory for LCA2019
2018-04-19 07:36:44 +10:00
James Polley
6e35fec262
Update gitlab CI to build test images for the lca2019 branch 2018-04-19 07:34:48 +10:00
James Polley
026199faf3
Change dev container build to load only the initial conference state 2018-04-19 07:10:33 +10:00
James Polley
34c7beec35
Update initial fixtures for LCA2019 2018-04-19 07:09:47 +10:00
James Polley
4162ba7c3f
Merge branch 'master' into ticket-testing 2018-04-17 15:54:38 +10:00
Sachi King
ce32fd69b6 Show chair for session on main overview page
Plus keep it a link so opt out is not impossible.
2018-01-24 15:27:37 +11:00
Sachi King
e41da66cac Fix bulk action
Bulk action marks printed + schwag, but as print is automated and
happens after checkin is flagged, we should only set checkin and schwag
and print will happen.
2018-01-23 13:30:45 +11:00
Sachi King
5a085535c0 Allow accessing URL to generate boarding pass
Only needed some code fixups to function
2018-01-21 16:14:22 +11:00
Sachi King
568536532c Force upnprint badge
So automation can try again
2018-01-21 15:10:57 +11:00
Sachi King
be00f257a1 Show username to assist finding user in admin list 2018-01-21 15:01:55 +11:00
Sachi King
ab7aaa95c3 Remove old code line 2018-01-21 14:19:42 +11:00
Sachi King
394cb870d3 Fix overview 2018-01-21 14:00:23 +11:00
James Polley
0af7bedae5 Add a management command to print badges 2018-01-21 12:37:28 +11:00
James Polley
3b0d9bf23a Update views.py 2018-01-21 00:48:24 +00:00
Sachi King
e59d8d5cd6 Warn that checkin disables profile edit 2018-01-21 00:48:23 +00:00
Sachi King
5beafb2c6b Disallow profile updating if user is checked in
It gives a flash and pops the user back to dashboard.
2018-01-21 00:48:23 +00:00
James Polley
971cb5d12d Expand admin ui for checkins to be useful for admins
... also (and this really should be another commit, I am a horrible
person) change name of exception text fields
2018-01-21 11:43:41 +11:00
Sachi King
98465934ff Show attendees shirts in overview
So schwag can be given out
2018-01-21 10:56:27 +11:00
Sachi King
7370fc6012 Add last minute fixes to flow
Exception text storage and check in needs to be sepearte to badge.
2018-01-21 10:45:01 +11:00
Sachi King
05a45b77ed Linkify the rego-code in overview view
Should make checkin of lookups easier, links to the page just after
boarding pass scanning
2018-01-21 10:45:01 +11:00
Sachi King
4b5fe34335 Add regex validation [A-Z0-9]{6} for input
Don't block submition, but give the user a red bar.

Also a link to overview.

Esp if it is 5+ sec to load, we don't need it 90%+ the time, don't page
through it in the scan print workflow.
2018-01-21 10:45:01 +11:00
Sachi King
f25f85f86e Convience redirect on .conf/checkin
Send voli's to the overview, and everyone else to what we want from
them.
2018-01-21 10:45:01 +11:00
Sachi King
8ee0dda5ac Base flow for checkin scanning
It's ugly...  But it should do the job.

Ref #40
2018-01-21 10:45:01 +11:00
James Polley
ac8df2da28 Use waffl to be able to flip overlay on/off 2018-01-21 00:53:02 +11:00
James Polley
a8551e999c Add in actually badge overlay 2018-01-21 00:50:51 +11:00
James Polley
23c056e046 Add a waffle.flag in order to force overlay usage 2018-01-21 00:12:06 +11:00
Sachi King
763f69cb61 Add overlay badge support
Support so print can print only important text.

SVG modified to use display:inline/none based on overlay True/False and
a symlink to make it easy to change to a completely seperate svg if that
is not optimal.

SVG added layers to split text and graphic so graphics can be easily
hidden and printed.

Closes: #38
2018-01-20 12:36:09 +11:00
James Polley
a7b619a2fd Need to list items per-user
Without this important line, each user gets the same manifest. not helpful.
2018-01-19 20:18:50 +11:00
James Polley
f9066d25d5 Add checkin code to manifest 2018-01-19 15:05:18 +11:00
James Polley
e120f7a691 Decode the image so it can be re-encoded
#sigh
2018-01-19 08:05:54 +11:00
James Polley
5a6759adae Refactor bpass build/send code
* Pull out the bits that prepare and build the bpass
* Make them not require a request object
* so that we can now call this code from another context
2018-01-19 07:03:44 +11:00
Joel Addison
135c5d2da3 Add track to schedule JSON
Include the track of the slow in the schedule JSON so the miniconf can be identified.
2018-01-18 21:40:14 +11:00