FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,079 Commits 40 Branches 6 Tags 67 MiB
51186bed7c
Commit Graph

285 Commits

Author SHA1 Message Date
Nabeel Shahzad
28f10eaf41 Validator fix for airport import/export 2018-07-13 07:45:29 -05:00
Nabeel Shahzad
f640381978 Export extra fields for airports 2018-07-12 22:21:39 -05:00
Nabeel Shahzad
9cc640b866 Fix PIREP field and non-existant airport errors when editing PIREPs 2018-07-12 21:20:10 -05:00
Nabeel Shahzad
81ecb5673f Merge branch 'dev' of https://github.com/nabeelio/phpvms into dev 2018-07-05 14:07:56 -05:00
Nabeel Shahzad
7c414e5419 (API) Delete the PIREP route before it's posted again 2018-07-05 14:07:54 -05:00
Nabeel Shahzad
316bc14526 Composer update 2018-06-20 11:39:28 -05:00
Nabeel Shahzad
9bc3a67c9a Move some database calls into a support class 2018-06-20 11:18:30 -05:00
Nabeel Shahzad
a083f9c671 Fix PIREP submission and field slug problems on PIREP edit 2018-05-30 14:00:20 -05:00
Nabeel Shahzad
59b99497a7 Route sorting 2018-05-28 18:15:51 -05:00
lordwilbur
ba8a819c7d - fixed an error on finance in admin panel 
- flight ident now use this format: VA IATA(if empty ICAO) + Flight Number + - + Flight Code (without C) + - + Flight Leg (without L)
- added function __trans_choice in helpers.php for translation
- fixed error in flight edit/insert panel not showing/inserting Tuesday in days
- fixed an error occurring when metar retrieved is empty
- edited now-ui-kit.css to align login fields correctly
- added /public/assets/frontend/js/core/jquery-3.3.1.min.js to fix a missed resource error in authentication pages
- added translations file for en and it locales
- translated all the frontend templates
 2018-05-21 09:53:08 -05:00
Nabeel Shahzad
3e96b195a6 Add short timeout to HTTP calls by default; cache METAR lookups 2018-05-14 11:22:20 -05:00
Nabeel Shahzad
bc7fccfb95 Cleanup the cancelled PIREP logic 2018-05-11 12:08:55 -05:00
Nabeel Shahzad
df88cb141a Allow draft for PIREPs, separate out the save/submit and delete functionality 2018-05-10 10:35:10 -05:00
Nabeel Shahzad
0cd7b3b71f live map updates 2018-05-04 13:59:47 -05:00
Nabeel Shahzad
23f1a8225a update livemap to use rivets.js bindings for data updates 2018-05-03 15:07:16 -05:00
Nabeel Shahzad
5dff563c75 Fixes for API and live map 2018-05-02 15:14:18 -05:00
Nabeel Shahzad
89f067807b comment out the flight dupe check on import 2018-04-25 12:05:12 -05:00
Nabeel Shahzad
531e86f5e7 Fix flight duplicate detection in add/edit/import; fix active checkbox 2018-04-25 11:53:32 -05:00
Nabeel Shahzad
cff7e2c4da some cleanup as-per phpstan 2018-04-23 08:46:28 -05:00
Nabeel Shahzad
c102a0d858 Refactor all of the unit conversion code 2018-04-07 20:52:12 -05:00
Nabeel Shahzad
e27f6f1b14 Add addtl fields to pirep - block_off and block_on times, calculate block_off time if not there 2018-04-04 13:03:10 -05:00
Nabeel Shahzad
052813ba4a Fixes in how METARs are parsed 2018-04-04 09:04:14 -05:00
Nabeel Shahzad
2351dbe717 Move caching into Metar base class, clean up of caller in the widget 2018-04-02 22:44:31 -05:00
Nabeel Shahzad
717118cfb4 Add METAR interface and use local library for decoding 2018-04-02 22:35:25 -05:00
Nabeel Shahzad
0f98e729ce Save file asset 2018-04-02 17:34:58 -05:00
Nabeel Shahzad
026a83591d Fixes to file uploading; include disk name, remove clunky redirect code 2018-04-02 11:04:32 -05:00
Nabeel Shahzad
cfd0853d79 Convert expense type to char, translations for ExpenseType 2018-04-01 22:26:20 -05:00
Nabeel Shahzad
793b3e7134 change ref_class to ref_model 2018-04-01 14:32:01 -05:00
Nabeel Shahzad
46f9b3d9b9 Typo #96 2018-03-30 22:36:01 -05:00
Nabeel Shahzad
1275d7ebc4 Set user on ON_LEAVE automatically after days in settings() #96 2018-03-30 22:28:19 -05:00
Nabeel Shahzad
9eb8ed1804 fix aircraft status field type in model 2018-03-30 21:45:11 -05:00
Nabeel Shahzad
217da07007 Fix column headers 2018-03-30 20:57:30 -05:00
Nabeel Shahzad
70e5ccda6f Add IATA and ZFW to aircraft import/export and tables 2018-03-30 20:21:18 -05:00
Nabeel Shahzad
1cbfdbdac5 don't attempt to convert flight type in flight exporter 2018-03-30 18:08:03 -05:00
Nabeel Shahzad
63544088cd Add validation to importers to fix invalid/empty columns #222 2018-03-30 17:27:29 -05:00
Nabeel Shahzad
bd30b1f900 Check for departure airport restrictions #221 2018-03-30 11:08:53 -05:00
Nabeel Shahzad
08d3578d38 Add cost_block_hour tests; extra logging 2018-03-29 14:55:25 -05:00
Nabeel Shahzad
cf43685740 Add/implement subfleet cost_block_hour and block_time for PIREP API 2018-03-29 13:42:16 -05:00
Nabeel Shahzad
0bf1286c3a Fix error in flight importer 2018-03-29 11:47:37 -05:00
Nabeel Shahzad
33daaf4a35 Add an InternalError type that piggybacks ValidationError 2018-03-23 17:29:54 -05:00
Nabeel Shahzad
c81fc5f25b only output airline icao in subfleet export 2018-03-23 16:38:56 -05:00
Nabeel Shahzad
f8f5a71564 Move subfleet add/remove to fleet service for a flight 2018-03-23 14:10:18 -05:00
Nabeel Shahzad
1161106d9c Fix airport field row being inserted and check against airport ID 2018-03-23 12:27:28 -05:00
Nabeel Shahzad
182cb2d33b Change flight_number field to uint 2018-03-22 23:11:59 -05:00
Nabeel Shahzad
29b84f9281 Reverse the iata/icao columns for airport import 2018-03-22 22:21:54 -05:00
Nabeel Shahzad
7105e82922 Add days of week to flights table; add to import/export for flights 2018-03-22 21:21:35 -05:00
Nabeel Shahzad
8b53ca2fdc Fix types and codes import 2018-03-22 19:59:35 -05:00
Nabeel Shahzad
112a72ac6f Subfleet exporter #194 2018-03-22 17:59:10 -05:00
Nabeel Shahzad
46d8fb125a Add fare import/exporter #194 2018-03-22 17:48:57 -05:00
Nabeel Shahzad
a44204b185 Import/export expenses #194 2018-03-22 17:17:37 -05:00
Nabeel Shahzad
4e3a9fd9ea Export airports 2018-03-22 13:04:13 -05:00
Nabeel Shahzad
d4f79b1331 Add aircraft export 2018-03-22 12:55:56 -05:00
Nabeel Shahzad
78e70fec3b Fix directory creation path 2018-03-22 12:48:27 -05:00
Nabeel Shahzad
fbfd71adcf Cleanup Exporter; use firstOrCreate for any missing data we can infer/setup defaults for 2018-03-22 12:43:58 -05:00
Nabeel Shahzad
9657e8bd40 Rename import/export, fix tests with parser 2018-03-21 19:12:36 -05:00
Nabeel Shahzad
276b93fc57 Export flights to CSV in admin #194 2018-03-21 17:07:30 -05:00
Nabeel Shahzad
b9beb6c804 Add importers in console and admin for flights/aircraft/subfleets and airport #194 2018-03-20 19:17:11 -05:00
Nabeel Shahzad
485c6e86bb add separate flight_fields table and move over to flight_field_values 2018-03-20 13:06:06 -05:00
Nabeel Shahzad
ccf56ddec1 Fix formatting and interfaces in nearly every file 2018-03-19 20:50:40 -05:00
Nabeel Shahzad
6b002f24a8 Store full datetime in post_date; recalculate finances on every pirep 2018-03-17 22:20:08 -05:00
Nabeel Shahzad
67ef6872af Call the AwardListener in the proper UserStatsChanged event #155 2018-03-17 12:55:50 -05:00
Nabeel Shahzad
e9baf4acb5 Add/edit the award class in Admin #155 2018-03-17 12:17:38 -05:00
Nabeel Shahzad
26f00ccaae Add the event listener for the awards #155 2018-03-17 00:55:39 -05:00
Nabeel Shahzad
7dd6a7e7f3 Awards base class and scaffolding #155 2018-03-16 23:59:53 -05:00
Nabeel Shahzad
067fb0f9f0 Implement events for cron expenses; add processing of daily/monthly expenses #136 2018-03-16 20:12:56 -05:00
Nabeel Shahzad
ccbc109db2 Add setting to automatically remove bid on PIREP accept #200 2018-03-15 18:20:07 -05:00
Nabeel Shahzad
dc2570a408 Rename the PirepService class 2018-03-06 17:36:06 -06:00
Nabeel Shahzad
a325470b8f Aircraft can have its own expenses #130 2018-03-06 17:32:56 -06:00
Nabeel Shahzad
c7925db0e7 Add field to charge an expense to a user #130 2018-03-06 17:15:42 -06:00
Nabeel Shahzad
dad923489b Set tags on transactions #130 2018-03-06 06:40:49 -06:00
Nabeel Shahzad
453ca5b180 Cleanup the transaction memos 2018-03-06 06:17:45 -06:00
Nabeel Shahzad
9d3953f3ac Refactor expenses; move finance service classes; add daily/monthly skeletons #130 #136 2018-03-05 22:49:42 -06:00
Nabeel Shahzad
88a8fd2bbd Remove subfleet_expenses and combine into main expenses table; select expense type on subfleet #130 #136 2018-03-05 21:24:49 -06:00
Nabeel Shahzad
505931736c Finance overview page added to admin with monthly breakdown #130 2018-03-05 19:55:48 -06:00
Nabeel Shahzad
33c2ee702b Cleanup subfleet expense name; reload page on recalculate #130 2018-03-05 13:15:47 -06:00
Nabeel Shahzad
96e8fbfa78 Add subfleet specific expenses, fixed bug for pirep fares #130 #136 2018-03-05 12:21:38 -06:00
Nabeel Shahzad
586769fbf0 Fix tests and docs/better checks #130 2018-03-02 17:29:11 -06:00
Nabeel Shahzad
9f89447070 Add pilot pay to journals; cleanup payment code #130 2018-03-02 13:12:39 -06:00
Nabeel Shahzad
02374dcd57 Update balance in callbacks 2018-03-01 22:00:11 -06:00
Nabeel Shahzad
2c52a2f7e6 Post fares/expenses on PIREP to Airline journal #130 2018-03-01 16:20:13 -06:00
Nabeel Shahzad
498e795e4b Fixes and tests for the journal and journaled transactions #130 2018-02-28 21:52:36 -06:00
Nabeel Shahzad
3188f356eb Add setting for home airport restriction #104 2018-02-28 15:27:46 -06:00
Nabeel Shahzad
6993cba55a Don't change rank if it seems like it's been manually changed by an admin #196 2018-02-28 15:01:23 -06:00
Nabeel Shahzad
e03abc1a64 Moved away from the phpmoney library since it requires intl extension 2018-02-28 13:54:14 -06:00
Nabeel Shahzad
777bd5e26d Return the pay in Money() format 2018-02-28 13:34:49 -06:00
Nabeel Shahzad
ae0c3c5f27 Get the pilot pay, reconcile with values for subfleet overrides 2018-02-27 16:16:40 -06:00
Nabeel Shahzad
dfa6d6da51 Split rank pay rate into separate rates for acars and manual flights 2018-02-27 14:29:45 -06:00
Nabeel Shahzad
3aa4b8a410 Cleanup and move subfleet/rank settings to FleetService class 2018-02-27 14:12:03 -06:00
Nabeel Shahzad
97764866f2 Rename user_bids table to bids 2018-02-27 13:25:32 -06:00
Nabeel Shahzad
58e0f50c48 specify fares, js to dynamically change fare form; get applicable fares for the flight/pirep #125 2018-02-24 15:38:25 -06:00
Nabeel Shahzad
d5aef6fb87 Allow setting percent for fare overrides against base fare #125 2018-02-23 15:12:09 -06:00
Nabeel Shahzad
53b0bbd936 Convert errors into HttpException calls 2018-02-22 15:15:00 -06:00
Nabeel Shahzad
6dfab75f08 Add api routes to get/add/remove bids for a user #172 2018-02-22 10:44:15 -06:00
Nabeel Shahzad
3abf38ab93 Return string if not multi-value; add delete_previous flag #194 2018-02-21 21:42:47 -06:00
Nabeel Shahzad
9ed370693d First pass at csv column parsing for kvp as values #194 2018-02-21 21:38:35 -06:00
Nabeel Shahzad
ea09a18956 Fixed formatting of almost every file 2018-02-20 22:33:09 -06:00
Nabeel Shahzad
4e43223f3a Refuse pirep prefile is user not allowed to use aircraft #170 2018-02-20 12:59:49 -06:00
Nabeel Shahzad
8393ae2851 Add /flight/:id/route resource, returns all route info that's in the navaid database closes #183 2018-02-20 12:06:52 -06:00
Nabeel Shahzad
c817d1ae4b Installer fixes 2018-02-12 09:47:12 -06:00
Nabeel Shahzad
762544ea6f don't change rank if it's not auto promoted #168 2018-02-10 17:53:25 -06:00
Nabeel Shahzad
5a89b4f194 write the route if it hasn't been set by acars #184 2018-02-10 16:10:19 -06:00
Nabeel Shahzad
3ded06390c ignore cancelled pireps in dupe check #179 2018-02-10 13:12:12 -06:00
Nabeel Shahzad
17f1085ffb Filter out flights depending on the only_flights_from_current setting #174 2018-02-09 15:36:13 -06:00
Nabeel Shahzad
9b55a9691f Setting which filters out aircraft not at the departure airport #171 2018-02-09 15:07:34 -06:00
Nabeel Shahzad
13b4a3854b move filterSubfleets() to FlightService class #170 2018-02-09 14:36:36 -06:00
Nabeel Shahzad
de0c71cb06 Set fields to pireps in prefile/update calls 2018-02-06 13:46:23 -06:00
Nabeel Shahzad
f660af5c3b Add config.php at root; include configuration overhaul and then fixes to the installer #156 2018-01-29 13:16:39 -06:00
Nabeel Shahzad
f9efa81bb4 Refactoring of PIREP submission and field code #146 2018-01-23 15:48:30 -06:00
Nabeel Shahzad
7c70bb0971 add setting to disable user aircraft rank restriction #138 2018-01-19 12:46:30 -05:00
Nabeel Shahzad
e3bce1cd69 Track hours on aircraft #73 2018-01-11 22:00:39 -06:00
Nabeel Shahzad
bf4e164e0d Add calls and API to get user's fleet, determined by rank #35 2018-01-10 18:40:01 -06:00
Nabeel Shahzad
dce9723979 Set airport and landing time of aircraft after pirep accept #112 2018-01-10 12:39:13 -06:00
Nabeel Shahzad
4a34286c67 remove return type of addUserBid() 2018-01-07 11:16:44 -06:00
Nabeel Shahzad
7e45291b27 Add pivot table for flight_fare to override fare #125 2018-01-07 09:19:46 -06:00
Nabeel Shahzad
4ee6830181 Make sure the dpt airport is known before trying to parse the route 2018-01-05 14:33:22 -06:00
Nabeel Shahzad
b29a07afd3 Split out the saveRoute() fn so it's only during a manual filing, not ACARS 2018-01-04 19:39:41 -06:00
web541
08df20de19 Fixed a few field entries (#116) 
* Stopped inheritance errors popping up

* Added fillable fields

These would not save otherwise.

* Added country fillable field

Wouldn’t save when importing from phpvms classic.

* Added more to classic importer

Change arguments to ask in terminal
Fixed table_prefix names in Importer.php

Added the ability to import users from phpvms classic (tested on
simpilot’s 5.5.x) and when importing, it will then reset the user’s
password to a temporary hash and then email it to the user to then
change when they first log in.

* Changes to ImporterService
 2018-01-03 15:41:21 -06:00
Nabeel Shahzad
9c319e73f9 Check whether a duplicate PIREP has been submitted 2018-01-02 13:17:22 -06:00
Nabeel Shahzad
37cdde845d Add order column to ACARS table for the order of the route points 2018-01-02 09:40:42 -06:00
Nabeel Shahzad
9150694051 Wrong Collection class import 2018-01-01 19:04:27 -06:00
Nabeel Shahzad
78af2fd637 cleanup of geojson and route map code 2018-01-01 19:02:22 -06:00
Nabeel Shahzad
5cf0bbaa65 Clean up the GeoJSON generation code 2018-01-01 16:01:01 -06:00
Nabeel Shahzad
d1c626afe8 remove duplicate method calls 2018-01-01 15:04:32 -06:00
Nabeel Shahzad
b456dc1a71 Save PIREP route to ACARS data table #102 2018-01-01 13:48:02 -06:00
Nabeel Shahzad
c65da0a0af delete the user bids when a flight is deleted #103 2018-01-01 09:32:04 -06:00
Nabeel Shahzad
81e82629ac Rename PilotState class to UserState 2017-12-30 20:40:32 -06:00
Nabeel Shahzad
2ddc613c81 add acars table to uuid table list 2017-12-30 14:13:47 -06:00
Nabeel Shahzad
520751b151 Move seed data into separate file with importer; fix admin panel js being broken 2017-12-29 17:34:09 -06:00
Nabeel Shahzad
7cd4bf5ffb Add user setup to installer 2017-12-29 16:56:46 -06:00
Nabeel Shahzad
e65edc5709 Fix error if there are no points in the ACARS route 2017-12-28 16:09:49 -06:00
Nabeel Shahzad
e2ab6445d2 flight follow if one is selected in map; don't draw full map 2017-12-28 16:00:43 -06:00
Nabeel Shahzad
5a6bc1a7ba draw route when you click on a flight 2017-12-28 14:59:42 -06:00
Nabeel Shahzad
9d92d8af55 More work on the pirep/acars maps 2017-12-28 14:35:28 -06:00
Nabeel Shahzad
ee328dabc6 geojson cleanup 2017-12-27 21:05:53 -06:00
Nabeel Shahzad
10985a7d97 Cleanup some of the geojson code 2017-12-27 20:52:37 -06:00
Nabeel Shahzad
edca0644ff Add acars map page and show in-progress flights 2017-12-27 16:47:22 -06:00
Nabeel Shahzad
4f6b8e8e23 plot actual flight path and datapoints from ACARS table 2017-12-26 15:26:12 -06:00
Nabeel Shahzad
3bd97b4d37 add PIREP pre-file and ACARS updates; removing caching from ACARS/Pirep/User repositories; adjust PirepState enum values; add additional columns 2017-12-25 15:19:34 -06:00
Nabeel Shahzad
70b1476e93 Add markers for the navpoints on the flight and pirep maps 2017-12-24 17:38:38 -06:00
Nabeel Shahzad
3b8621371a show dates/times in user's timezone 2017-12-23 11:58:17 -06:00
Nabeel Shahzad
b382ad77eb Pilot changed event fixed for new airport 2017-12-22 16:55:47 -06:00
Nabeel Shahzad
babdca627e Fixes and cleanup for user pending/registration calls 2017-12-22 16:32:21 -06:00
Nabeel Shahzad
7103278bb8 Woops, re-add user state check 2017-12-22 13:54:25 -06:00
Nabeel Shahzad
1ebf2bd09c Don't allow login if user is pending or rejected; some refactoring of the registration code 2017-12-22 13:38:24 -06:00
Nabeel Shahzad
161623c85e Fixes for emails; send user registered/pending depending on state 2017-12-22 12:46:46 -06:00
Nabeel Shahzad
74316218bc Add some event listeners and experiment with browser testing 2017-12-22 12:00:57 -06:00
Nabeel Shahzad
6c546b5094 Add flight route map; algorithm for picking from multiple nav points; some tests 2017-12-20 19:12:39 -06:00
Nabeel Shahzad
e5278bc0bf Output PIREP map with just the dep/arr airports for now 2017-12-20 11:28:21 -06:00
Nabeel Shahzad
0375bb420f Major refactoring for PIREP statuses and states to accomodate ACARS/route data 2017-12-19 20:19:36 -06:00
Nabeel Shahzad
5bedbba2a7 use laratrust to replace entrust #78 2017-12-15 12:36:13 -06:00