Commit Graph

99 Commits

Author SHA1 Message Date
Nathan Coad
bc881f3abb Merge branch 'master' of gitlab.coadcorp.com:drupal/booking 2016-07-21 07:41:34 +10:00
5c8b7d662f undo test 2016-06-29 19:16:05 +10:00
4e4dcf1cc9 testing change from ID to class for role highlighting 2016-06-29 19:05:09 +10:00
9ceabb97c7 fix missing references to reserve helper 2016-06-29 16:45:32 +10:00
7934d0718c add reserve helper role to studygroups 2016-06-29 16:40:05 +10:00
622c84314b tweak debug messages for editing a person's studygroups 2016-06-27 10:56:31 +10:00
Nathan Coad
e30f2f7d6f more formatting tweaks 2016-06-24 15:40:41 +10:00
Nathan Coad
4df8c4f059 add age to studygroup CSV report 2016-06-24 15:21:17 +10:00
Nathan Coad
087f0405ef fix message quoting 2016-06-24 14:35:57 +10:00
Nathan Coad
3bdaa51657 fix the separation logic 2016-06-24 14:34:04 +10:00
Nathan Coad
49e93895e8 change debug message again 2016-06-24 14:28:54 +10:00
Nathan Coad
bfc6de4ba5 fix debug message 2016-06-24 14:27:31 +10:00
Nathan Coad
66f634f600 test 2016-06-24 14:23:50 +10:00
Nathan Coad
2de599cae2 bugfix 2016-06-24 14:18:16 +10:00
Nathan Coad
1ac064be32 add keep separate flag 2016-06-24 14:16:35 +10:00
Nathan Coad
54984e89e5 fix array references 2016-06-24 12:44:46 +10:00
Nathan Coad
d5a810badc enhance debugging 2016-06-24 12:41:49 +10:00
Nathan Coad
d864f9b3bd pass some other missing variables to function 2016-06-24 12:37:09 +10:00
Nathan Coad
afdbd91222 move allocation to separate function 2016-06-24 12:34:49 +10:00
Nathan Coad
39d6a31e3b fix parameter ordering 2016-06-24 12:16:19 +10:00
Nathan Coad
1322956634 work on tidying up study group calculation functions 2016-06-24 12:07:37 +10:00
e52d6ffc65 add manually assigned column to booking_studygroups_view_form() 2016-06-23 22:05:22 +10:00
83ed03f7ff logic change in studygroup calculations for committee members 2016-06-23 18:36:42 +10:00
e69ebc95bd remove deprecated studygroup calculation function 2016-06-23 18:28:39 +10:00
4adc2b4ee5 fix 2016-06-23 16:33:34 +10:00
76e2357c78 update 2016-06-23 16:30:10 +10:00
d4d1f9e14e Merge branch 'master' of gitlab.coadcorp.com:drupal/booking 2016-06-23 16:28:26 +10:00
193f6d9400 continue work on manual allocation flag 2016-06-23 16:28:20 +10:00
Nathan Coad
f7c5a15108 commence work on manual allocation flag 2016-06-23 16:25:55 +10:00
Nathan Coad
ccac5cd293 fix reading group handling 2016-06-23 14:17:08 +10:00
e2f640ab30 change fudge factor again 2016-06-22 18:08:32 +10:00
d0e5d370eb change group fudge factor 2016-06-22 18:01:36 +10:00
2493f7eb98 update readings group colours if someone is indivually reassigned 2016-06-22 17:54:14 +10:00
567c141f2a tidyup 2016-06-22 17:35:34 +10:00
f73d52ef40 update reading goup colour processing to use booking_is_readinggroup flag 2016-06-22 17:30:21 +10:00
Nathan Coad
747d1bbc0b work on dynamic form for manual emails 2016-06-03 09:45:16 +10:00
89460e6157 add highlighting to manual email page for welfare cases 2016-05-25 22:58:22 +10:00
f027df3f6e cleanup trailing whitespace 2016-05-19 08:24:50 +10:00
3ce77ebea6 rename booking_event_id in booking_person table 2016-05-03 22:49:45 +10:00
51bc775664 Fix preg_match fail 2014-12-01 23:06:39 +11:00
7a0220aa86 Slight changes 2014-12-01 22:53:45 +11:00
7098d26756 fix errors generated with no attendees 2014-11-18 17:58:34 +11:00
c42503523e bugfixes 2014-11-18 17:50:40 +11:00
66c859f2af studygroup code cleanup 2014-11-18 17:39:13 +11:00
be3cc83630 minor tweaks to UI 2014-11-18 16:46:03 +11:00
61ba6cc45a Tweaks for study/reading groups 2014-11-17 23:42:49 +11:00
54ec39cbbd Tidy up studygroup definition form 2014-11-17 18:42:50 +11:00
27a7dfdd69 bug fixes 2014-11-17 18:00:51 +11:00
ad131989b5 Minor tweaks 2014-06-30 17:40:26 +10:00
53ea1fd2fe Make it easier to see leaders and helpers in studygroup lists 2014-06-27 15:06:19 +10:00