jessikitty/bus-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101 Commits 1 Branch 0 Tags
8d4837538cd0743a18d3a43478b606f765d74bd2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
st01765 8d4837538c Fixed requirements.txt file encoding 2025-09-08 14:46:44 +10:00
st01765 38fc69d815 Updated requirements versions 2025-09-08 14:32:17 +10:00
st01765 6442472c0d Added Telstra SMS test function to settings page 2025-09-08 13:54:45 +10:00
John Mullins af2f47b7f9 Added function to email schools shuttle rolls. 2025-02-18 15:40:38 +11:00
John Mullins 034b9f7d91 Fixed shuttle count 2024-12-13 09:49:12 +11:00
John Mullins dabce7f360 Added date selector to shuttles and traveller counts 2024-12-13 09:36:41 +11:00
John Mullins 320303f95f Added date selector to rolls 2024-12-12 14:33:25 +11:00
John Mullins 3392597696 Added hidden family admin view 2024-11-11 13:32:56 +11:00
John Mullins c50ebc9e2a Fixed debug setting and minor cleanup 2024-11-11 11:37:10 +11:00
John Mullins 6bd2664352 Added SMS functions to buses and travellers 2024-11-11 11:36:39 +11:00
John Mullins a7e4f3e2de Current users email used as BCC email 2024-09-02 10:17:16 +10:00
John Mullins 17f170ea89 Added traveller clone function which duplicates inlines 2024-08-27 09:07:35 +10:00
John Mullins 66428102a2 Merge remote-tracking branch 'origin/main' 2024-08-26 14:30:54 +10:00
John Mullins ea83a40668 Adding rounding to farepaying status 
Added route filtering by traveller ID instead of traveller object
 2024-08-26 14:30:34 +10:00
John Mullins 60172160bf Fixed address and added active status to route context 2024-08-26 14:30:15 +10:00
John Mullins 675962be91 Added crontab tasks 2024-06-12 12:58:46 +10:00
John Mullins f37827fd9d Added global BCC setting for emails 2024-06-12 11:43:49 +10:00
John Mullins 98019055f1 Formating changes for roll reports 2024-06-12 11:08:47 +10:00
John Mullins 00659568ee Added email emergency contacts to bus companies function 2024-06-12 11:08:05 +10:00
John Mullins 57bee43c38 Added lookup filter as ID after version 5 dango update 2024-06-11 14:09:21 +10:00
John Mullins a30a69afb3 Updated requirements.txt versions 2024-06-11 14:08:29 +10:00
John Mullins aac0358adc Fixed family mapping in emergency export 2024-02-28 11:15:36 +11:00
John Mullins ec3b33def3 Added dates to bus rolls 2024-02-26 17:19:03 +11:00
John Mullins 35692c0903 Removing hardcoded BCC email list 2024-02-25 23:51:47 +11:00
John Mullins 67681eceff Hard coded bbc email for companies 2024-02-23 15:54:37 +11:00
John Mullins 6d7755f866 Removed nonetype return for string 2024-02-16 18:20:43 +11:00
John Mullins d5743035c1 Removed temporary address migration tool 2024-02-16 18:16:06 +11:00
John Mullins cd022fbf54 Added cached readonly field "address" to traveler to allow search functionally and reduce database lookups 2024-02-16 18:10:08 +11:00
John Mullins 83d5874155 Removing parent data from traveller model 2024-02-16 17:54:54 +11:00
John Mullins ee212a47c5 Temporary migration task for family data 2024-02-16 17:23:20 +11:00
John Mullins fa9d6ee128 Adding Family Model 2024-02-16 17:07:08 +11:00
John Mullins 9a3d244c8e Removed fee per term from export 
Removed print statements from backup function
 2024-01-24 10:21:39 +11:00
John Mullins 0f3631f579 Rollover submit moved to POST 
Changed archived lookup to active lookup
 2024-01-24 10:05:44 +11:00
John Mullins 1d5df4ad35 Changed datetime object to strings in backup exporter 2024-01-22 16:05:55 +11:00
John Mullins 6a4eb6d123 Fixed new namespace for azure auth 2024-01-22 12:57:22 +11:00
John Mullins c0ed8e00db Merge remote-tracking branch 'origin/main' 2024-01-22 12:44:40 +11:00
John Mullins 9399dfcf99 Adding init file for custom_user app 2024-01-22 12:44:22 +11:00
John Mullins cc86eae6b9 Added database exporter in settings panel. Downloads a .json file 2023-12-22 18:58:12 +11:00
John Mullins d74290036e Moved where active status is displayed. 
Cleaned up logout redirects
Added suburbs admin page back. Wasn't able to create new suburbs
Made active status check to any traveller save function
 2023-12-22 16:50:30 +11:00
John Mullins f73b08e989 Added save task to traveller routes to update traveller active status and bulk task designed for morning automated task. Can be run manually from settings page 2023-12-21 17:50:35 +11:00
John Mullins 514171c68b Removing transfer school from shuttles. Causing database errors 2023-12-21 16:44:43 +11:00
John Mullins 25ddf1edfa Moved active status to a database entry apposed to a function 
Added settings page
Cleaned up rollover page
 2023-12-21 16:14:56 +11:00
John Mullins 1240ab2538 Moved azure login to local app. Removed ability for new users to be created automatically 2023-12-15 15:00:41 +11:00
John Mullins 7519585c84 Removed bad import for template editor 2023-12-11 10:28:25 +11:00
John Mullins d858bf84fd Added rollover function. 
Hidden some admin views
 2023-12-11 10:25:30 +11:00
John Mullins 776042703e Cleaned up libaries and imports 2023-12-11 10:20:17 +11:00
John Mullins 686f35d8f6 Bad import 2023-12-07 10:42:02 +11:00
John Mullins 815baf2c59 Small code cleanup. Fixed bad import 2023-12-07 10:41:10 +11:00
John Mullins 1cec36d593 Moved SMS function out of admin.py 2023-12-07 10:36:32 +11:00
John Mullins 93410d5c9e Removed WIP mailtemplates out of prod settings.py 2023-11-30 12:12:17 +11:00
John Mullins 7b36d9abc9 Replacing template with base settings.py 2023-11-30 12:06:45 +11:00
John Mullins 2717b53b8d Added date range filter for start and end dates for travellers 2023-11-20 15:52:42 +11:00
John Mullins 52ebd0697a Missing import for confirmation letter 2023-11-20 14:37:44 +11:00
John Mullins 0dea60d29e Added confirmation_letter template. Still WIP and needs to be replaced with something more dynamic. 2023-11-20 14:35:26 +11:00
John Mullins e56fdc8d3c Hide routes if marked as hidden 2023-11-02 12:02:47 +11:00
John Mullins 0bb23f007a Added shuttle roll 2023-11-02 11:59:12 +11:00
John Mullins 528370d811 Made route stops optional in bus roll export (shuttles only) 2023-11-02 11:57:39 +11:00
John Mullins 350dfe4acb Added times to traveller csv export 2023-11-02 11:05:44 +11:00
John Mullins d68dcfccc1 Only allow sending of SMS to active students by default 2023-10-11 15:03:42 +11:00
John Mullins 3cfc4b545f Moved shuttles to be paged per stop 
Added custom name to shuttle roll
 2023-10-11 14:55:55 +11:00
John Mullins d4a6113e31 Moved roll some context to bus object 
Added first_name to traveller ordering
 2023-10-11 13:22:02 +11:00
John Mullins ff8b4c21fc Added traveller count to shuttle roll and removed inactive from roll 2023-10-11 13:14:52 +11:00
John Mullins 5fd3bbfa87 Added start_date clause to traveller.is_active() function 2023-10-11 12:59:15 +11:00
John Mullins 291f1d5f6d Actually maybe fixed is_active() function... 2023-10-11 12:15:16 +11:00
John Mullins ab3e30f7d0 Changed bus roll paginator 2023-10-11 12:11:45 +11:00
John Mullins 425e40eade Added company to bus roll context 2023-10-05 11:07:39 +11:00
John Mullins 5c8e81dbec Fixed context for company value in email roll to company function 2023-10-05 10:46:30 +11:00
John Mullins 0e225f48a4 Added year filter to traveller list view 2023-10-04 12:56:18 +11:00
John Mullins 78434588e2 Removed print statements 
Added custom_name attribute to shuttles
 2023-09-14 14:28:15 +10:00
John Mullins c40b6f764b Actually maybe fixed is_active() function... 2023-09-08 16:34:34 +10:00
John Mullins f421d28dc5 Fixed end_date in is active check. > to a < 2023-09-08 16:17:13 +10:00
John Mullins 43c23498bf Added Send SMS function to traveller contacts. The send command is commented out. 2023-09-07 15:42:11 +10:00
John Mullins 49dae4892b Added shuttles to traveller view and filter 2023-09-05 16:06:32 +10:00
John Mullins 020b8b2678 Bus roll stops page together 2023-09-05 13:00:01 +10:00
John Mullins 86a3ad139d Added shuttles to bus roll 2023-09-05 11:14:42 +10:00
John Mullins c55471a298 Email roll to schools function 2023-09-01 16:24:55 +10:00
John Mullins d051bc8beb Email roll to schools function 2023-09-01 15:18:20 +10:00
John Mullins 99530513c1 Changed names of is_archived fields 2023-09-01 12:11:17 +10:00
John Mullins 86c9b13c9a Added csv export for traveller and email to schools function 2023-09-01 11:23:30 +10:00
John Mullins b93d488598 Fixed seating_capacity mapping 2023-08-31 12:02:21 +10:00
John Mullins 6caf62e72f Added reports to top left admin menu bar 
Combined summary pages
Changed admin panel to index
 2023-08-31 11:59:32 +10:00
John Mullins 3568613607 Added azure auth. Lots of changes in settings.py 2023-08-30 15:05:57 +10:00
John Mullins 8005621594 Added default for Traveller.is_archived 2023-08-30 12:06:09 +10:00
John Mullins f7dde89de2 Added stop_route to traveller list view. Performance should be okay 2023-08-29 16:54:13 +10:00
John Mullins ab22868584 Moved emergency contacts view to pdf view 2023-08-29 16:17:04 +10:00
John Mullins eb03670290 Added fields to changelist view. Added hyperlinks and mailto links 2023-08-29 16:16:38 +10:00
John Mullins 4eb2909a16 Added archive field. Set during rollover or when end date is removed 2023-08-29 14:18:48 +10:00
John Mullins 90e8c22423 Email bus rolls function uses company email field 2023-08-29 13:47:44 +10:00
John Mullins eb6b3c1450 Removed old import 2023-08-29 12:46:58 +10:00
John Mullins 51eec5257b Added creation and last edit entries. Plan to use for recent changes when sending out to companies. 
Small cleanups
 2023-08-29 12:44:42 +10:00
John Mullins 0c8de0285a Changed bus roll to be a pdf view. Small changes needed to be able to email to companies. 
Dropdown selection in admin > buses > Email Bus Roll To Company
Will email bus roll only to the company the route is a member of. Will show all to the admin in a pdf file.

Recipients are currently hardcoded for testing purposes.
 2023-08-29 12:40:34 +10:00
John Mullins 2f1ae0586b Added traveller count + hyperlinks to bus and shuttle view 2023-08-28 15:27:24 +10:00
John Mullins f9981aadf0 New reports 
Added per term fare paid to traveller model
Fixed parent in emergency contacts report
 2023-08-28 11:41:31 +10:00
John Mullins cc706420a5 Clean up with clone class 2023-08-28 11:38:20 +10:00
John Mullins 45149ffb5d I think this works now!!! 2023-08-25 14:14:34 +10:00
John Mullins 4008b7e19f Added adminClone view 2023-08-25 10:32:45 +10:00
John Mullins 4e15e98801 Removed name from Shuttles. Based just on bus and school 
Formatting cleanups
 2023-08-25 10:28:44 +10:00
John Mullins c07fd817a8 Added clone model (WIP) 2023-08-25 10:27:11 +10:00
John Mullins c312f8ea85 Added importer to company model 
Cleaned imports
 2023-08-22 14:51:43 +10:00
John Mullins 084a3aa9f9 Add static folders to .gitignore 2023-08-22 14:51:04 +10:00