fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908
Flight Type Translations (#1306 )
2021-09-12 22:33:09 +00:00 · 2021-09-10 08:17:19 -04:00 · 2021-09-08 12:22:17 -04:00 · 2021-09-08 10:51:04 -04:00 · 2021-09-08 09:50:34 -04:00
20 changed files with 254 additions and 255 deletions
@@ -102,12 +102,12 @@ class PirepStatusChanged extends Notification implements ShouldQueue
                        $planned_distance = new Distance($pirep->planned_distance, $unit);
                        $pd = $planned_distance[$planned_distance->unit];
                        $fields['Distance'] .= '/'.$pd;
-                    } catch (NonNumericValue | NonStringUnitName $e) {
+                    } catch (NonNumericValue|NonStringUnitName $e) {
                    }
                }

                $fields['Distance'] .= ' '.$planned_distance->unit;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+            } catch (NonNumericValue|NonStringUnitName $e) {
            }
        }

@@ -73,7 +73,7 @@ class PirepSubmitted extends Notification implements ShouldQueue

                $pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
                $fields['Distance (Planned)'] = $pd;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+            } catch (NonNumericValue|NonStringUnitName $e) {
            }
        }

@@ -25,9 +25,11 @@ class AircraftImporter extends ImportExport
        'subfleet'     => 'required',
        'iata'         => 'nullable',
        'icao'         => 'nullable',
+        'airport_id'   => 'nullable',
        'name'         => 'required',
        'registration' => 'required',
        'hex_code'     => 'nullable',
+        'mtow'         => 'nullable|numeric',
        'zfw'          => 'nullable|numeric',
        'status'       => 'nullable',
    ];
@@ -29,6 +29,7 @@ class FlightImporter extends ImportExport
        'airline'              => 'required',
        'flight_number'        => 'required',
        'route_code'           => 'nullable',
+        'callsign'             => 'nullable',
        'route_leg'            => 'nullable',
        'dpt_airport'          => 'required',
        'arr_airport'          => 'required',
@@ -45,6 +46,8 @@ class FlightImporter extends ImportExport
        'pilot_pay'            => 'nullable',
        'route'                => 'nullable',
        'notes'                => 'nullable',
+        'start_date'           => 'nullable|date',
+        'end_date'             => 'nullable|date',
        'active'               => 'nullable|boolean',
        'subfleets'            => 'nullable',
        'fares'                => 'nullable',
@@ -20,15 +20,14 @@ class SubfleetImporter extends ImportExport
     */
    public static $columns = [
        'airline'                    => 'required',
+        'hub_id'                     => 'required',
        'type'                       => 'required',
+        'simbrief_type'              => 'nullable',
        'name'                       => 'required',
        'fuel_type'                  => 'nullable',
        'cost_block_hour'            => 'nullable',
        'cost_delay_minute'          => 'nullable',
        'ground_handling_multiplier' => 'nullable',
-        'cargo_capacity'             => 'nullable',
-        'fuel_capacity'              => 'nullable',
-        'gross_weight'               => 'nullable',
        'fares'                      => 'nullable',
    ];

@@ -206,7 +206,7 @@ class PirepService extends Service
    /**
     * Create a new PIREP with some given fields
     *
-     * @param Pirep                   $pirep
+     * @param Pirep $pirep
     * @param array PirepFieldValue[] $field_values
     *
     * @return Pirep
@@ -1,5 +1,5 @@
 {
-  "name": "phpvms",
+  "name": "npm-proj-1631485984071-0.9184711947503159t8yC4F",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -22,7 +22,7 @@
        "jquery": "^3.5.1",
        "jquery-pjax": "~2.0",
        "js-yaml": "^3.14.0",
-        "laravel-mix": "^6.0.25",
+        "laravel-mix": "^6.0.30",
        "leaflet": "^1.3.4",
        "leaflet-ajax": "2.1.0",
        "leaflet-providers": "1.0.*",
@@ -2082,10 +2082,10 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
      "engines": [
        "node >= 0.8.0"
      ],
@@ -4009,6 +4009,14 @@
        "node": ">= 10"
      }
    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/define-properties": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -6168,6 +6176,20 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/has-value": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -7162,11 +7184,12 @@
      }
    },
    "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
      "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -7738,11 +7761,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
    "node_modules/kind-of": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -7778,9 +7796,9 @@
      }
    },
    "node_modules/laravel-mix": {
-      "version": "6.0.25",
-      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.25.tgz",
-      "integrity": "sha512-SDpLGUnXJ8g0rvtiLljSTJSR6awj86M2Jd3MhbtT32TCgwXdtajVLF7Mv2blsPLixGHtynwZgi+UFlYQbquPLg==",
+      "version": "6.0.30",
+      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.30.tgz",
+      "integrity": "sha512-Y5EjdPVEqVMgnglzJvDuDEpUa2EouutS4ySrukZkBWh2EPPYM1iszu8TItvQ2J08N5BPIrYWh8McUbTwq6tcrQ==",
      "dependencies": {
        "@babel/core": "^7.14.5",
        "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
@@ -7827,7 +7845,7 @@
        "vue-style-loader": "^4.1.3",
        "webpack": "^5.38.1",
        "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "4.0.0-beta.3",
+        "webpack-dev-server": "4.1.1",
        "webpack-merge": "^5.8.0",
        "webpack-notifier": "^1.13.0",
        "webpackbar": "^5.0.0-3",
@@ -7981,9 +7999,9 @@
      }
    },
    "node_modules/laravel-mix/node_modules/http-proxy-middleware": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
+      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
      "dependencies": {
        "@types/http-proxy": "^1.17.5",
        "http-proxy": "^1.18.1",
@@ -7992,7 +8010,7 @@
        "micromatch": "^4.0.2"
      },
      "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
      }
    },
    "node_modules/laravel-mix/node_modules/import-local": {
@@ -8058,15 +8076,16 @@
      }
    },
    "node_modules/laravel-mix/node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
+      "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
      },
      "engines": {
-        "node": ">=8"
+        "node": ">=12"
      },
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
@@ -8251,37 +8270,35 @@
      }
    },
    "node_modules/laravel-mix/node_modules/webpack-dev-server": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.3.tgz",
-      "integrity": "sha512-Ud7ieH15No/KiSdRuzk+2k+S4gSCR/N7m4hJhesDbKQEZy3P+NPXTXfsimNOZvbVX2TRuIEFB+VdLZFn8DwGwg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz",
+      "integrity": "sha512-Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg==",
      "dependencies": {
-        "ansi-html": "^0.0.7",
+        "ansi-html-community": "^0.0.8",
        "bonjour": "^3.5.0",
        "chokidar": "^3.5.1",
+        "colorette": "^1.2.2",
        "compression": "^1.7.4",
        "connect-history-api-fallback": "^1.6.0",
        "del": "^6.0.0",
        "express": "^4.17.1",
-        "find-cache-dir": "^3.3.1",
        "graceful-fs": "^4.2.6",
        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^1.3.1",
+        "http-proxy-middleware": "^2.0.0",
        "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.0",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "open": "^7.4.2",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
        "p-retry": "^4.5.0",
        "portfinder": "^1.0.28",
-        "schema-utils": "^3.0.0",
+        "schema-utils": "^3.1.0",
        "selfsigned": "^1.10.11",
        "serve-index": "^1.9.1",
        "sockjs": "^0.3.21",
        "spdy": "^4.0.2",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^7.0.0",
        "url": "^0.11.0",
-        "webpack-dev-middleware": "^4.1.0",
-        "ws": "^7.4.5"
+        "webpack-dev-middleware": "^5.0.0",
+        "ws": "^8.1.0"
      },
      "bin": {
        "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -8290,7 +8307,7 @@
        "node": ">= 12.13.0"
      },
      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "webpack": "^4.37.0 || ^5.0.0"
      },
      "peerDependenciesMeta": {
        "webpack-cli": {
@@ -8298,12 +8315,37 @@
        }
      }
    },
-    "node_modules/laravel-mix/node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+    "node_modules/laravel-mix/node_modules/webpack-dev-server/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
      "engines": {
-        "node": ">=8.3.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/laravel-mix/node_modules/webpack-dev-server/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/laravel-mix/node_modules/ws": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+      "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
+      "engines": {
+        "node": ">=10.0.0"
      },
      "peerDependencies": {
        "bufferutil": "^4.0.1",
@@ -8521,17 +8563,6 @@
        "semver": "bin/semver.js"
      }
    },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/map-cache": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -8601,33 +8632,10 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/mem?sponsor=1"
-      }
-    },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.4.tgz",
+      "integrity": "sha512-2mDCPhuduRPOxlfgsXF9V+uqC6Jgz8zt/bNe4d4W7d5f6pCzHrWkxLNr17jKGXd4+j2kQNsAG2HARPnt74sqVQ==",
      "dependencies": {
        "fs-monkey": "1.0.3"
      },
@@ -9555,14 +9563,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
    "node_modules/p-event": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
@@ -13653,19 +13653,18 @@
      }
    },
    "node_modules/webpack-dev-middleware": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz",
-      "integrity": "sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.1.0.tgz",
+      "integrity": "sha512-oT660AR1gOnU/NTdUQi3EiGR0iXG7CFxmKsj3ylWCBA2khJ8LFHK+sKv3BZEsC11gl1eChsltRhzUq7nWj7XIQ==",
      "dependencies": {
        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
        "memfs": "^3.2.2",
-        "mime-types": "^2.1.30",
+        "mime-types": "^2.1.31",
        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^3.1.0"
      },
      "engines": {
-        "node": ">= v10.23.3"
+        "node": ">= 12.13.0"
      },
      "funding": {
        "type": "opencollective",
@@ -15718,10 +15717,10 @@
        }
      }
    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+    "ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
    },
    "ansi-regex": {
      "version": "4.1.0",
@@ -17210,6 +17209,11 @@
        "execa": "^5.0.0"
      }
    },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
+    },
    "define-properties": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -18881,6 +18885,14 @@
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
    "has-value": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -19637,11 +19649,12 @@
      }
    },
    "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
      "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
      }
    },
    "is-arrayish": {
@@ -20041,11 +20054,6 @@
      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="
    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
    "kind-of": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -20075,9 +20083,9 @@
      }
    },
    "laravel-mix": {
-      "version": "6.0.25",
-      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.25.tgz",
-      "integrity": "sha512-SDpLGUnXJ8g0rvtiLljSTJSR6awj86M2Jd3MhbtT32TCgwXdtajVLF7Mv2blsPLixGHtynwZgi+UFlYQbquPLg==",
+      "version": "6.0.30",
+      "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.30.tgz",
+      "integrity": "sha512-Y5EjdPVEqVMgnglzJvDuDEpUa2EouutS4ySrukZkBWh2EPPYM1iszu8TItvQ2J08N5BPIrYWh8McUbTwq6tcrQ==",
      "requires": {
        "@babel/core": "^7.14.5",
        "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
@@ -20124,7 +20132,7 @@
        "vue-style-loader": "^4.1.3",
        "webpack": "^5.38.1",
        "webpack-cli": "^4.7.2",
-        "webpack-dev-server": "4.0.0-beta.3",
+        "webpack-dev-server": "4.1.1",
        "webpack-merge": "^5.8.0",
        "webpack-notifier": "^1.13.0",
        "webpackbar": "^5.0.0-3",
@@ -20222,9 +20230,9 @@
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
        },
        "http-proxy-middleware": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-          "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
+          "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
          "requires": {
            "@types/http-proxy": "^1.17.5",
            "http-proxy": "^1.18.1",
@@ -20275,12 +20283,13 @@
          }
        },
        "open": {
-          "version": "7.4.2",
-          "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-          "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+          "version": "8.2.1",
+          "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
+          "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
          "requires": {
-            "is-docker": "^2.0.0",
-            "is-wsl": "^2.1.1"
+            "define-lazy-prop": "^2.0.0",
+            "is-docker": "^2.1.1",
+            "is-wsl": "^2.2.0"
          }
        },
        "p-limit": {
@@ -20393,43 +20402,56 @@
          }
        },
        "webpack-dev-server": {
-          "version": "4.0.0-beta.3",
-          "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.3.tgz",
-          "integrity": "sha512-Ud7ieH15No/KiSdRuzk+2k+S4gSCR/N7m4hJhesDbKQEZy3P+NPXTXfsimNOZvbVX2TRuIEFB+VdLZFn8DwGwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz",
+          "integrity": "sha512-Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg==",
          "requires": {
-            "ansi-html": "^0.0.7",
+            "ansi-html-community": "^0.0.8",
            "bonjour": "^3.5.0",
            "chokidar": "^3.5.1",
+            "colorette": "^1.2.2",
            "compression": "^1.7.4",
            "connect-history-api-fallback": "^1.6.0",
            "del": "^6.0.0",
            "express": "^4.17.1",
-            "find-cache-dir": "^3.3.1",
            "graceful-fs": "^4.2.6",
            "html-entities": "^2.3.2",
-            "http-proxy-middleware": "^1.3.1",
+            "http-proxy-middleware": "^2.0.0",
            "internal-ip": "^6.2.0",
-            "ipaddr.js": "^2.0.0",
-            "is-absolute-url": "^3.0.3",
-            "killable": "^1.0.1",
-            "open": "^7.4.2",
+            "ipaddr.js": "^2.0.1",
+            "open": "^8.0.9",
            "p-retry": "^4.5.0",
            "portfinder": "^1.0.28",
-            "schema-utils": "^3.0.0",
+            "schema-utils": "^3.1.0",
            "selfsigned": "^1.10.11",
            "serve-index": "^1.9.1",
            "sockjs": "^0.3.21",
            "spdy": "^4.0.2",
-            "strip-ansi": "^6.0.0",
+            "strip-ansi": "^7.0.0",
            "url": "^0.11.0",
-            "webpack-dev-middleware": "^4.1.0",
-            "ws": "^7.4.5"
+            "webpack-dev-middleware": "^5.0.0",
+            "ws": "^8.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
+            },
+            "strip-ansi": {
+              "version": "7.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+              "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+              "requires": {
+                "ansi-regex": "^6.0.1"
+              }
+            }
          }
        },
        "ws": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-          "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",
+          "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",
          "requires": {}
        }
      }
@@ -20605,14 +20627,6 @@
        }
      }
    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
    "map-cache": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -20667,26 +20681,10 @@
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
    },
-    "mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
-        }
-      }
-    },
    "memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.4.tgz",
+      "integrity": "sha512-2mDCPhuduRPOxlfgsXF9V+uqC6Jgz8zt/bNe4d4W7d5f6pCzHrWkxLNr17jKGXd4+j2kQNsAG2HARPnt74sqVQ==",
      "requires": {
        "fs-monkey": "1.0.3"
      }
@@ -21405,11 +21403,6 @@
      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
      "dev": true
    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
    "p-event": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
@@ -24577,16 +24570,15 @@
      }
    },
    "webpack-dev-middleware": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz",
-      "integrity": "sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.1.0.tgz",
+      "integrity": "sha512-oT660AR1gOnU/NTdUQi3EiGR0iXG7CFxmKsj3ylWCBA2khJ8LFHK+sKv3BZEsC11gl1eChsltRhzUq7nWj7XIQ==",
      "requires": {
        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
        "memfs": "^3.2.2",
-        "mime-types": "^2.1.30",
+        "mime-types": "^2.1.31",
        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+        "schema-utils": "^3.1.0"
      },
      "dependencies": {
        "schema-utils": {
@@ -27,7 +27,7 @@
    "jquery": "^3.5.1",
    "jquery-pjax": "~2.0",
    "js-yaml": "^3.14.0",
-    "laravel-mix": "^6.0.25",
+    "laravel-mix": "^6.0.30",
    "leaflet": "^1.3.4",
    "leaflet-ajax": "2.1.0",
    "leaflet-providers": "1.0.*",
@@ -23,17 +23,17 @@ return [
    'departuretime'    => 'Abflugzeit',
    'arrivaltime'      => 'Ankunftszeit',
    'type'             => [
-        'pass_scheduled'    => 'Passagier - planmäßig',
-        'cargo_scheduled'   => 'Fracht - planmäßig',
-        'charter_pass_only' => 'Charter - Nur Passagier',
-        'addtl_cargo_mail'  => 'Zusätzliche Fracht/Post',
-        'special_vip'       => 'Spezieller VIP-Flug (FAA/Behörde)',
-        'pass_addtl'        => 'Passagier - Zusätzlich',
-        'charter_cargo'     => 'Charter - Fracht/Post',
+        'pass_scheduled'    => 'Passagier (Planmäßig)',
+        'cargo_scheduled'   => 'Fracht (Planmäßig)',
+        'charter_pass_only' => 'Passagier (Charter)',
+        'addtl_cargo_mail'  => 'Fracht (Zusätzliche)',
+        'special_vip'       => 'Spezieller VIP-Flug',
+        'pass_addtl'        => 'Passagier (Zusätzlich)',
+        'charter_cargo'     => 'Fracht (Charter)',
        'ambulance'         => 'Ambulanzflug',
        'training_flight'   => 'Trainingsflug',
        'mail_service'      => 'Postdienst',
-        'charter_special'   => 'Charter mit Sonderbehandlung',
+        'charter_special'   => 'Passagier (Charter mit Sonderbehandlung)',
        'positioning'       => 'Positionierung (Fähre/Lieferung/Demo)',
        'technical_test'    => 'Technischer Test',
        'military'          => 'Militär',
@@ -23,20 +23,20 @@ return [
    'departuretime'    => 'Departure Time',
    'arrivaltime'      => 'Arrival Time',
    'type'             => [
-        'pass_scheduled'    => 'Passenger - Scheduled',
-        'cargo_scheduled'   => 'Cargo - Scheduled',
-        'charter_pass_only' => 'Charter - Passenger Only',
-        'addtl_cargo_mail'  => 'Additional Cargo/Mail',
-        'special_vip'       => 'Special VIP Flight (FAA/Government)',
-        'pass_addtl'        => 'Passenger - Additional',
-        'charter_cargo'     => 'Charter - Cargo/Mail',
-        'ambulance'         => 'Ambulance Flight',
-        'training_flight'   => 'Training Flight',
+        'pass_scheduled'    => 'Passenger (Scheduled)',
+        'pass_addtl'        => 'Passenger (Additional)',
+        'charter_pass_only' => 'Passenger (Charter)',
+        'charter_special'   => 'Passenger (Special Charter)',
+        'cargo_scheduled'   => 'Cargo (Scheduled)',
+        'addtl_cargo_mail'  => 'Cargo (Additional)',
+        'charter_cargo'     => 'Cargo (Charter)',
        'mail_service'      => 'Mail Service',
-        'charter_special'   => 'Charter w/ Special Handling',
-        'positioning'       => 'Positioning (Ferry/Delivery/Demo)',
-        'technical_test'    => 'Technical Test',
+        'special_vip'       => 'VIP Flight',
+        'ambulance'         => 'Ambulance',
+        'training_flight'   => 'Training',
        'military'          => 'Military',
+        'positioning'       => 'Positioning',
+        'technical_test'    => 'Technical Test',
        'technical_stop'    => 'Technical Stop',
    ],
 ];
@@ -23,18 +23,18 @@ return [
    'departuretime'    => 'Hora de salida',
    'arrivaltime'      => 'Hora de llegada',
    'type'             => [
-        'pass_scheduled'    => 'Pasajero - Programado',
-        'cargo_scheduled'   => 'Carga - Programado',
-        'charter_pass_only' => 'Charter - Solo pasajeros',
-        'addtl_cargo_mail'  => 'Carga/correo adicional',
-        'special_vip'       => 'Vuelo VIP especial (Autoridad de Aviación Civil)',
-        'pass_addtl'        => 'Pasajero - Adicional',
-        'charter_cargo'     => 'Charter - Carga/Correo',
+        'pass_scheduled'    => 'Pasajero (Programado)',
+        'cargo_scheduled'   => 'Carga (Programado)',
+        'charter_pass_only' => 'Pasajero (Charter)',
+        'addtl_cargo_mail'  => 'Carga (Adicional)',
+        'special_vip'       => 'Vuelo VIP especial',
+        'pass_addtl'        => 'Pasajero (Adicional)',
+        'charter_cargo'     => 'Carga (Charter)',
        'ambulance'         => 'Vuelo ambulancia',
        'training_flight'   => 'Vuelo de entrenamiento',
        'mail_service'      => 'Servicio postal',
-        'charter_special'   => 'Charter con cargas especiales',
-        'positioning'       => 'Posicionamiento (Ferry/Entrega/Demo)',
+        'charter_special'   => 'Pasajero (Charter con cargas especiales)',
+        'positioning'       => 'Posicionamiento',
        'technical_test'    => 'Prueba técnica',
        'military'          => 'Militar',
        'technical_stop'    => 'Parada técnica',
@@ -22,18 +22,18 @@ return [
    'departuretime'    => 'Ora di Partenza',
    'arrivaltime'      => 'Ora di Arrivo',
    'type'             => [
-        'pass_scheduled'    => 'Passeggeri - Programmato',
-        'cargo_scheduled'   => 'Cargo - Programmato',
-        'charter_pass_only' => 'Charter - Solo Passeggeri',
-        'addtl_cargo_mail'  => 'Cargo/Posta Addizionale',
-        'special_vip'       => 'Volo VIP Speciale (FAA/Governo)',
-        'pass_addtl'        => 'Passeggeri - Addizionale',
-        'charter_cargo'     => 'Charter - Cargo/Posta',
+        'pass_scheduled'    => 'Passeggeri (Programmato)',
+        'cargo_scheduled'   => 'Cargo (Programmato)',
+        'charter_pass_only' => 'Passeggeri (Charter)',
+        'addtl_cargo_mail'  => 'Cargo (Addizionale)',
+        'special_vip'       => 'Volo VIP Speciale',
+        'pass_addtl'        => 'Passeggeri (Addizionale)',
+        'charter_cargo'     => 'Cargo (Charter)',
        'ambulance'         => 'Volo Ambulanza',
        'training_flight'   => 'Volo di Addestramento',
        'mail_service'      => 'Servizio Postale',
-        'charter_special'   => 'Charter con Manutenzione Speciale',
-        'positioning'       => 'Posizionamento (Traghetto/Consegna/Dimostrazione)',
+        'charter_special'   => 'Passeggeri (Charter Speciale)',
+        'positioning'       => 'Posizionamento',
        'technical_test'    => 'Prova Tecnica',
        'military'          => 'Militare',
        'technical_stop'    => 'Fermo Tecnico',
@@ -23,18 +23,18 @@ return [
    'departuretime'    => 'Hora de partida',
    'arrivaltime'      => 'Hora de chegada',
    'type'             => [
-        'pass_scheduled'    => 'Passageiro - Programado',
-        'cargo_scheduled'   => 'Carga - Programado',
-        'charter_pass_only' => 'Charter - Somente passageiros',
-        'addtl_cargo_mail'  => 'Carga/Mail Adicional',
-        'special_vip'       => 'Voo VIP especial (FAA/Governo)',
-        'pass_addtl'        => 'Passageiro - Adicional',
-        'charter_cargo'     => 'Charter - Carga/Mail',
+        'pass_scheduled'    => 'Passageiro (Programado)',
+        'cargo_scheduled'   => 'Carga (Programado)',
+        'charter_pass_only' => 'Passageire (Charter)',
+        'addtl_cargo_mail'  => 'Carga (Adicional)',
+        'special_vip'       => 'Voo VIP especial',
+        'pass_addtl'        => 'Passageiro (Adicional)',
+        'charter_cargo'     => 'Carga (Charter)',
        'ambulance'         => 'Voo de emergência',
        'training_flight'   => 'Voo de treinamento',
        'mail_service'      => 'Serviço de correio',
-        'charter_special'   => 'Charter c/ Handling Especial',
-        'positioning'       => 'Posicionamento (Ferry/Delivery/Demo)',
+        'charter_special'   => 'Passageire (Charter Especial)',
+        'positioning'       => 'Posicionamento',
        'technical_test'    => 'Teste Técnico',
        'military'          => 'Militar',
        'technical_stop'    => 'Parada Técnica',
@@ -38,12 +38,15 @@
        <td style="text-align: center;">{{ $atf->code }}</td>
        <td>
          <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
+          <span class="small background-color-grey-light">({{ $atf->capacity }})</span>
        </td>
        <td>
          <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
+          <span class="small background-color-grey-light">({{ $atf->price }})</span>
        </td>
        <td>
          <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
+          <span class="small background-color-grey-light">({{ $atf->cost }})</span>
        </td>
        <td style="text-align: center; width:3%;">
          {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',
@@ -1,3 +1,3 @@
-subfleet,iata, icao, name,registration,hex_code,zfw,status
-A32X,A320,320,A320-211,N309US,,,S
-74X,747 400, ,,
+subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
+A32X,A320,320,,A320-211,N309US,,,,S
+74X,747 400, ,,,
@@ -1,3 +1,3 @@
-subfleet,iata, icao, name,registration,hex_code,zfw,status
-A32X,A320,320,A320-211,N309US,,,A
-74X,747 400, ,,
+subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
+A32X,A320,320,,A320-211,N309US,,,,A
+74X,747 400,, ,,
@@ -1,3 +1,3 @@
-subfleet,name,registration,hex_code,status
-A32X,A320-211,N309US,,
- , B744-GE, N304,,
+subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
+A32X,A320-211,,N309US,,,
+ , B744-GE,, N304,,,
@@ -1,5 +1,5 @@
-airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,active,subfleets,fares,fields
-VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
-"  ",1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,100,10, ,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
-VMS,113,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,70,2,,,"Empty distance",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
-VMS,999,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X;B737,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+airline,flight_number,route_code,callsign,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,start_date,end-date,active,subfleets,fares,fields
+VMS,1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+"  ",1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,100,10, ,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+VMS,113,,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,70,2,,,"Empty distance",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
+VMS,999,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X;B737,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
@@ -1,2 +1,2 @@
-airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,active,subfleets,fares,fields
-VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,,,,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,
+airline,flight_number,route_code,callsign,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,start_date,end-date,active,subfleets,fares,fields
+VMS,1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,,,,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,
@@ -1,3 +1,3 @@
-airline,type,name,fuel_type,cost_block_hour,cost_delay_minute,ground_handling_multiplier,cargo_capacity,fuel_capacity,gross_weight,fares
-VMS,A32X,"Airbus A320",,1000,0,200,,,,Y;B?capacity=100&price=500%
-VMS, ,"Boeing 747-400",,1000,0,200,,,,Y;B?capacity=100&price=500%
+airline,hub_id,type,simbrief_type,name,fuel_type,cost_block_hour,cost_delay_minute,ground_handling_multiplier,fares
+VMS,KAUS,A32X,,"Airbus A320",,1000,0,200,Y;B?capacity=100&price=500%
+VMS,EGPH, ,,"Boeing 747-400",,1000,0,200,Y;B?capacity=100&price=500%
Author	SHA1	Message	Date
snyk-bot	52a43acb1a	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908	2021-09-12 22:33:09 +00:00
B.Fatih KOZ	e13a019a40	Flight Type Translations (#1306 ) * Flights EN * Flights DE * Flights ES * Flights IT * Flights PT-BR	2021-09-10 08:17:19 -04:00
B.Fatih KOZandNabeel S	91f928ecf4	Add missing base fare values from template (#1302 ) Add missing base fare values Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>	2021-09-08 12:22:17 -04:00
Nabeel Shahzad	226ae6d109	Style fixes	2021-09-08 10:51:04 -04:00
lesmar54	90d1708aab	Fixes to CSV import Exports (#1299 ) * Update SubfleetImporter.php Correction to the import to include Simbrief Code * Update SubfleetImporter.php Added in the missing fields HUB-ID and SIMBrief as these are input on the main screen * Update AircraftImporter.php Part of the missing data fields in csv import export * Update FlightImporter.php Part of the missing fields in csv import and export * Update AircraftImporter.php * Update FlightImporter.php * Update aircraft.csv Test data amended as part of the missing csv fields * Update subfleets.csv Part of the fix for missing fields in csv files used for import/export * Update flights.csv * Update FlightImporter.php * Update subfleets.csv Removed unused fields * Update FlightImporter.php * Update FlightImporter.php * Update FlightImporter.php * amended for new csv file layouts	2021-09-08 09:50:34 -04:00