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

374 Commits

Author SHA1 Message Date
Nabeel S
03cfc648b0
Create journal when new airline is created #667 (#670) 2020-04-26 10:31:58 -04:00
Nabeel S
8e97a7cc5c
Load Simbrief and flight data when getting bids #664 (#665) 2020-04-15 10:11:06 -04:00
Nabeel S
4a3ec38919
Option for SB only on bids; add the new file type #642 (#643) 
Option for SB only on bids; add the new file type #642
 2020-03-27 11:49:19 -04:00
Nabeel S
9e5386264f
SimBrief integration #405 (#635) 
* SimBrief integration #405

* Add briefing as API response; add acars_xml field #405
 2020-03-23 09:31:35 -04:00
Nabeel S
632c5782de
Add fare type for pax/cargo/mixed flights #621 (#623) 2020-03-06 15:10:03 -05:00
Nabeel S
9f3ddd5dbd
Add fixed pilot pay for a flight #487 (#622) 2020-03-06 11:36:02 -05:00
Nabeel S
16c977c769
Add load_factor and load_factor_variance to flights #352 (#620) 2020-03-05 20:19:12 -05:00
Nabeel S
ea9ee985e8
METAR parsing infinite loop bugfix #599 (#600) 
METAR parsing infinite loop bugfix #599
 2020-02-28 22:50:41 -05:00
Nabeel S
14aacdfb75
Import expense and ledger entries #443 (#588) 
* Fix rank importing with PIREP pay #443

* Import ledger information #443

* Uncomment out testing importers

* Import expense log and settings #443

* Formatting
 2020-02-25 14:45:23 -05:00
Nabeel S
07a75de0bf
Recalcuate aircraft stats in nightly cron and importer #585 #443 (#587) 2020-02-24 19:35:28 -05:00
Nabeel S
11bbcd1df7
User country mapping; ignore unused groups #443 (#584) 
* Fix the user country import #443

* Ignore the old "core" groups because they're unused #443

* Properly sync roles and individual permissions #443
 2020-02-24 15:12:36 -05:00
Nabeel S
dfbaa1afd3
Fix rowmapper generator, check for fields, map users #443 (#583) 
* Fix rowmapper generator, check for fields, map users #443

* Formatting

* Remove value store at the end of the import

* Update the notes for the importer about users

* Uncomment importers disabled during testing
 2020-02-23 19:48:28 -05:00
Nabeel S
a1d6fa17ad
Respect home hubs setting for registration #580 (#581) 
Respect home hubs setting for registration #580
 2020-02-23 17:21:26 -05:00
Nabeel S
0e13905098
Upstream null version; build version tags not being saved properly #575 (#578) 
* Check for null version from upstream #575

* Fix for pre-release version numbering

* Move popup to right

* Split get/generate build ID #575
 2020-02-23 12:23:19 -05:00
Nabeel S
9304daea7a
Add the argc_argv flag for the cgi exec #553 (#556) 2020-02-18 17:01:00 -05:00
Nabeel S
b9993b9c23
Set expenses on specific flight types #348 (#549) 
* Set expenses on specific flight types #348

* Formatting

* Use strict check for in_array
 2020-02-12 10:40:52 -05:00
Nabeel S
f392bf1cb8
Add additional events for PIREP states #436 (#548) 2020-02-11 13:56:20 -05:00
Nabeel S
99118daad9
Auto update #449 (#545) 
* Add custom repository type for updates

* Direct to self update module

* Formatting
 2020-02-10 17:47:46 -05:00
Nabeel S
94cfbd4748
Use optional() around the airport fields (#537) 
* Use optional() around the airport fields

* Add null-coalesce around full_name
 2020-02-03 12:23:58 -05:00
Nabeel S
03184db2fe
Fix live and route map errors #527 (#528) 2020-01-31 13:57:21 -05:00
Nabeel S
51b50972c8
Try to clear caches before updating (#522) 
* Try to clear caches before updating

* Add clear-compiled to maintenance cache list

* Formatting
 2020-01-30 14:59:48 -05:00
Nabeel S
3c1b433c29
Reduce number of queries for update check (#520) 2020-01-30 12:44:59 -05:00
Nabeel S
d03a77bd4b
New subfleet not being attached to an airline on import #479 (#505) 
* Fix subfleet not being attached to an airline on creation in import #479

* Call airline name with optional() around subfleet

* Minor cleanup
 2020-01-16 14:23:23 -05:00
Nabeel S
c2f7c5e421
Properly create/update rows importing #486 (#503) 2020-01-16 10:40:42 -05:00
Nabeel S
831b72fb2b
Set a default model value for airports on PIREP (#500) 
* Set a default model value for airports on PIREP

* Fix airport icao reference

* Default airport models
 2020-01-15 13:00:58 -05:00
Nabeel S
7d07008871
Fix GeoService errors when viewing PIREP #498 (#499) 2020-01-15 09:09:58 -05:00
Nabeel S
74052e4542
Return the flight fares if there are no subfleet fares #488 (#489) 
* Return the flight fares if there are no subfleet fares #488

* Formatting

* Formatting
 2020-01-06 13:44:43 -05:00
Nabeel S
4f4d0c266a
Allow nullable field and calculate distance if nulled for flight import #478 (#482) 2019-12-25 17:16:34 +05:00
Nabeel Shahzad
66a1192739 Cleanup Model doc 2019-12-22 09:46:41 +05:00
Nabeel S
e862537a20
Split the importer module out from the installer module (#468) 
* Split the importer module out from the installer module

* Cleanup of unused imports

* Move updater into separate module #453

* Remove unused imports/formatting

* Disable the install and importer modules at the end of the setup

* Unused imports; update IJ style

* test explicit stage for php+mysql

* add more to matrix

* Add different MariaDB versions

* undo
 2019-12-12 15:07:35 -05:00
Nabeel S
a58bca390b
Fix BindingResolutionError when debug toolbar isn't present (#465) 
* Fix BindingResolutionError when debug toolbar isn't present

* Formatting
 2019-12-11 15:12:31 -05:00
Nabeel S
e6d38f9338
Add PHP 7.4 support (#464) 
* Add PHP 7.4 to build matrix

* DB fix

* YAML parser fix in test data

* Show versions

* Package updates

* Track used ICAOs

* 7.4 METAR parsing fix

* METAR parser fix

* Formatting

* Add meters to response units

* Call instance for unit conversion

* Return value

* Catch exception for unknown quantity

* Comment fix

* Formatting

* METAR parsing fixes on PHP 7.4

* Package updates

* More random airport ID

* More random airport ID

* Properly disable toolbar

* Semver written out to version file

* Use dev as default identifier
 2019-12-11 12:57:18 -05:00
Nabeel S
1f65b744a0
Fix CSV imports giving Storage class not found #454 (#462) 
* Fix CSV imports giving Storage class not found #454

* Update yarn files for security alert
 2019-12-10 13:53:55 -05:00
Nabeel S
d9a1e6aba7
Use DateTimeZone instead of int for creating datetime 
closes #461
 2019-12-09 22:11:20 -05:00
Nabeel S
8cb0021b9f
Use PhpExecutableFinder() closes #457 #458 (#460) 2019-12-09 15:26:30 -05:00
Nabeel S
50dc79bc8d
Refactor and add importer to Installer module #443 (#444) 
* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting
 2019-11-27 09:19:20 -05:00
Nabeel S
ea3ab21beb
391 Notification refactorings (#441) 
* Refactor notifications to allow easier plugins

* Notification refactoring

* Formatting

* Move news to NewsService; cleanup of events

* More refactoring; added send email out for news item and the template

* Formatting

* Formatting
 2019-11-20 10:16:01 -05:00
Nabeel S
bffa5ebde2
Refactor the upgrade pending check to see if there are settings/permissions yaml changes (#438) 2019-11-19 10:54:42 -05:00
Nabeel S
3ec64c989b
Fixes (#435) 
* Add flight level field to PIREP field closes #401

* Default value for distance 0 closes #400

* Block airline deletion if assets exist #367

* Formatting

* Move some of the base exception classes

* Fix skin references to use settings table

* Set default for theme name if setting is wrong
 2019-11-19 10:06:07 -05:00
Nabeel S
f5183babf6
#406 Refactor bids (#432) 
* Add flight_id column to pireps table

* Refactor PIREPs and bids closes 406

* Formatting
 2019-11-05 11:44:31 -05:00
Nabeel S
a45770732a
Show a message about setting up the cron and if there was an error running it (#425) 2019-10-30 09:55:32 -04:00
Nabeel S
ae68550448
Move telemetry option into settings; checkbox in install refs #415 (#416) 2019-10-29 13:07:53 -04:00
Nabeel S
7a34756188
Issue fixes (#413) 
* Auto lookup missing airports closes #404

* Ensure flight ICAOs are capitalized closes #404

* Update htaccess in root closes #412

* Update htaccess in root closes #412

* StyleCI fix
 2019-10-23 12:01:31 -04:00
Nabeel S
aedb1f22b6
Don't allow cancels from certain states (#396) 
* Don't allow cancels from certain states

* Unused imports

* Don't reset the state doubly

* Move SetUserActive into listener; code cleanup

* Unused imports

* Add missing files into htaccess

* Move Command contract to correct folder
 2019-09-16 13:08:26 -04:00
Nabeel S
37fc761567
380 vacentral library (#381) 
* Update vaCentral library for new API server format

* Formatting

* Remove missing/unused import
 2019-09-05 16:55:51 -04:00
Nabeel S
fd2f4f2150
Move airline transaction code into service layer (#371) 
* Move airline transaction code into service layer

* Remove unused import
 2019-08-26 14:55:59 -04:00
Nabeel S
651174bda8
229 url for downloads (#369) 
* Allow file uploads for subfleet

* Allow URL to be used for a download

* Remove old FileUploadRequest

* Move file removal logic to service layer

* Remove unused import

* Remove unused packages
 2019-08-26 14:43:50 -04:00
Nabeel S
bbec276da8
#355 Calculate distance button (#366) 
* #355 Calculate distance button in add/edit Flight page

* Styling

* Move add/edit flight logic out of controller and into service layer

* Styling

* Formatting

* Run styleci against modules dir

* Styleci config

* Style fixes in /modules
 2019-08-26 12:32:46 -04:00
Nabeel S
6018a6dcaa
Add Contract interface for airport lookup functionality (#365) 
* Add Contract interface for airport lookup functionality

* style ci fixes
 2019-08-22 14:32:49 -04:00
Nabeel S
182aabf426
Refactor error handling internally to follow RFC7807 (#362) 
* Refactor error handling internally to follow RFC7807

* style fixes
 2019-08-21 08:17:44 -04:00
Nabeel S
dc51897314
Additional logging for the stats recalculation (#358) 
* Additional logging for the stats recalculation

* style fix
 2019-08-10 20:42:35 -04:00
Nabeel S
47be7507f0
Fix/metar reading (#354) 
* Account for empty ICAO; added tests

* Fix null returns

* Fix typo in volume units display

* Add version field for bug report template

* Some more changes to the bug report template
 2019-08-08 17:41:53 -04:00
Nabeel S
5cafebe4d6
Fix/metar reading (#353) 
* Fix reading of the METAR information for AviationWeather. Fix the DI

* StyleCI fixes
 2019-08-08 14:52:34 -04:00
Nabeel S
a08c9db284
Add setting to include transfer hours in calculations (#350) 
* Add setting to include transfer hours in calculations

* Add some extra tests to check versions

* A couple of more version test cases
 2019-08-08 12:50:43 -04:00
Nabeel Shahzad
f6465bea58 Add error logging around metar parsing call 2019-08-07 13:25:40 -04:00
Nabeel S
e12188b7d3
Issue/327 versioning (#345) 
* Switch to semver format

* Rewrite new version check to use Github Releases and cron

* Styling

* Remove v from in front of version

* New version check test fix

* Uncomment test case
 2019-08-06 17:48:00 -04:00
Nabeel S
092b9fc9dc
Add step fields to enable decimal points on fields #342 (#343) 
* Add step fields to enable decimal points on fields #342

* Update js-yaml version due to vulnerability scan

* Don't seed dev files when env == local

* Fix

* Fix  to be static

* Add visibilty keyword
 2019-08-06 15:54:21 -04:00
Nabeel S
9f3ba05880
Issue/329 refactor seeding (#337) 
* Fix Contracts class names

* Refactoring of the file seeds so it's not a mess

* StyleCI fixes
 2019-08-05 08:27:53 -04:00
Nabeel S
95147e31bf
Fix issue where user stats aren't incremented on PIREP auto accept (#335) 
* Fix issue where user stats aren't incremented on PIREP auto accept

* Formatting
 2019-08-01 15:23:59 -04:00
Nabeel Shahzad
71f5d33af7 Formatting in FlightExporter 2019-07-23 09:42:31 -04:00
Nabeel Shahzad
62a10224a0 Account for fuel in the finance calculations #313 2019-07-23 08:41:20 -04:00
Nabeel Shahzad
c6547ac7fc Style fix 2019-07-18 09:55:10 -04:00
Nabeel Shahzad
748601064c Fix Validator import 2019-07-18 09:54:03 -04:00
Nabeel Shahzad
a9c5be1c70 Add opcache option; change detection during install for cache driver 2019-07-18 09:26:33 -04:00
Nabeel Shahzad
9475a737f0 Change exporter to use utf-8 close #282 2019-07-17 13:36:16 -04:00
Nabeel Shahzad
567ff91de0 Add pilot ID change fields to the admin screen 2019-07-17 09:48:20 -04:00
Nabeel Shahzad
80560ec20c Formatting 2019-07-16 14:06:13 -04:00
Nabeel Shahzad
3e1d9080df Backend changes separating id from pilot_id 2019-07-16 13:54:14 -04:00
Nabeel Shahzad
dd946d4cdd Reorder imports 2019-07-15 15:51:35 -04:00
Nabeel Shahzad
a720f12e0b Rename Interfaces to Contracts to better match Laravel conventions 2019-07-15 15:44:31 -04:00
Nabeel Shahzad
b28ace970c Add interface to additional roles/permissions 2019-06-20 16:52:37 -04:00
Nabeel Shahzad
a176ed2dae Apply fixes from StyleCI 2019-06-18 22:58:09 +00:00
Nabeel Shahzad
2ca1f33e68 Formatting 2019-05-12 18:05:36 -05:00
Nabeel Shahzad
dbd7c5e90b Style fixes 2019-05-12 17:49:58 -05:00
Nabeel Shahzad
d65b74d7a0 Formatting 2019-05-12 17:37:22 -05:00
Nabeel Shahzad
75eaec2f11 phpcs standards 2019-05-12 12:08:31 -05:00
Nabeel Shahzad
3a6e3e0e24 Style fixes 2019-04-07 22:27:10 -05:00
Nabeel Shahzad
ec662243d8 Style fixes 2019-04-07 22:27:10 -05:00
Nabeel Shahzad
29a578ea6a Move the MigrationService to the main package 2019-04-07 22:27:10 -05:00
Nabeel Shahzad
6816c77845 Cleanup array_merge call 2019-04-07 22:27:09 -05:00
Kevin Susanto
f46e5090ae Fix SettingsController saving boolean value as 'on' 2018-09-04 16:11:51 +08:00
Nabeel Shahzad
1c1c0d55f4 Force truth state on pilot acceptance value #269 2018-09-02 10:47:37 -04:00
Nabeel Shahzad
3c32f2d89d Apply fixes from StyleCI 2018-08-26 18:51:47 +00:00
Nabeel Shahzad
e95b3eb366 Code cleanup from inspection results 2018-08-26 13:50:08 -05:00
Nabeel Shahzad
9596d88b48 Apply fixes from StyleCI 2018-08-26 16:40:04 +00:00
Nabeel Shahzad
66a9b361cb Cosmetics 2018-08-20 09:48:39 -05:00
Nabeel Shahzad
89baf34824 Initial user stats recalculation #254 2018-08-20 09:42:54 -05:00
Nabeel Shahzad
c40a8c893d Readd bids.disable_flight_on_bid, fixes tests 2018-07-24 15:58:11 -05:00
Nabeel Shahzad
0ce86e9e44 Rewrite add/remove bids code w additional tests 2018-07-24 14:50:50 -05:00
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