diff --git a/package.json b/package.json
index ca702c2..95a4e0d 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"autoprefixer": "^10.4.16",
"eslint": "^8.55.0",
"eslint-config-prettier": "^8.10.0",
- "eslint-plugin-vue": "^9.19.2",
+ "eslint-plugin-vue": "^9.28.0",
"postcss": "^8.4.14",
"prettier": "^2.8.8"
},
diff --git a/src/components/flightPlans/FlightFromPlanForm.vue b/src/components/flightPlans/FlightFromPlanForm.vue
index 98421f0..2e1f2e3 100644
--- a/src/components/flightPlans/FlightFromPlanForm.vue
+++ b/src/components/flightPlans/FlightFromPlanForm.vue
@@ -1,9 +1,9 @@
diff --git a/src/components/flightPlans/FlightPlanWeatherInfo.vue b/src/components/flightPlans/FlightPlanWeatherInfo.vue
index a0e8088..9cf159b 100644
--- a/src/components/flightPlans/FlightPlanWeatherInfo.vue
+++ b/src/components/flightPlans/FlightPlanWeatherInfo.vue
@@ -1,12 +1,9 @@
@@ -54,13 +58,19 @@ const markers = getMarkersFrom(props.flightPlan);
flat bordered
hide-bottom
:title="flightPlan.name"
- :rows="markers"
+ :rows="markersWithWeather"
:columns="columns"
:rows-per-page-options="[0]"
>
- {{ props.row.name }}
+
+ {{ props.row.name }}
+
+
+
+ {{ formatDatetime(props.row.weatherInfo.datetime) }}
+
@@ -68,14 +78,15 @@ const markers = getMarkersFrom(props.flightPlan);
{{ props.row.weatherInfo.temperatureSurface }}° C
- Rosný bod {{ props.row.weatherInfo.dewpointSurface }}° C
+
+ Rosný bod {{ props.row.weatherInfo.dewpointSurface }}° C
+
-
{{ props.row.weatherInfo.windDirectionSurface }}°
{{ kmhToKnots(props.row.weatherInfo.windSpeedSurface) }} kt
@@ -84,11 +95,16 @@ const markers = getMarkersFrom(props.flightPlan);
-
+
celkové pokrytí oblačností {{ props.row.weatherInfo.cloudcoverTotal }} %
nízké mraky {{ props.row.weatherInfo.cloudcoverLow }} %
+
+
+
+ odhadovaná výška základen: {{ getCloudsBase(props.row.weatherInfo) }} m
+
diff --git a/src/composables/units.js b/src/composables/units.js
index 1674b46..45e3bfc 100644
--- a/src/composables/units.js
+++ b/src/composables/units.js
@@ -4,5 +4,10 @@ export const useUnitsConvertors = () => {
return Math.round(speedKmh * 0.53996);
}
- return {kmhToKnots}
+ const ftToM = (distanceInFt) => {
+ return Math.round(distanceInFt * 0.3048 * 10) / 10;
+ }
+
+ return {kmhToKnots, ftToM}
}
+
diff --git a/src/pages/profile/flightPlanner/FlightPlanEditPage.vue b/src/pages/profile/flightPlanner/FlightPlanEditPage.vue
index 90a7497..f26730a 100644
--- a/src/pages/profile/flightPlanner/FlightPlanEditPage.vue
+++ b/src/pages/profile/flightPlanner/FlightPlanEditPage.vue
@@ -9,276 +9,34 @@ export default {
-
-
-
- Trasa
-
-
-
-
- Informace
-
-
-
-
- Počasí
-
-
-
-
- Navigační štítek
-
-
-
-
- Let
-
-
+
+
+
+ {{ tab.label }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- V plánu nemáš žádné letiště vzletu nebo přistání. Pro import letu musíš nahrát trasu.
-
-
-
-
-
-
-
-
- Přidat otočný bod
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
diff --git a/src/pages/profile/flightPlanner/FlightPlanFlightPage.vue b/src/pages/profile/flightPlanner/FlightPlanFlightPage.vue
new file mode 100644
index 0000000..0fa7fa0
--- /dev/null
+++ b/src/pages/profile/flightPlanner/FlightPlanFlightPage.vue
@@ -0,0 +1,90 @@
+
+
+
+
+ V plánu nemáš žádné letiště vzletu nebo přistání. Pro import letu musíš nahrát trasu.
+
+
+
diff --git a/src/pages/profile/flightPlanner/FlightPlanInfoPage.vue b/src/pages/profile/flightPlanner/FlightPlanInfoPage.vue
new file mode 100644
index 0000000..f1cd650
--- /dev/null
+++ b/src/pages/profile/flightPlanner/FlightPlanInfoPage.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
diff --git a/src/pages/profile/flightPlanner/FlightPlanMapPage.vue b/src/pages/profile/flightPlanner/FlightPlanMapPage.vue
new file mode 100644
index 0000000..cb6a069
--- /dev/null
+++ b/src/pages/profile/flightPlanner/FlightPlanMapPage.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+ Přidat otočný bod
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/profile/flightPlanner/FlightPlanNavlogPage.vue b/src/pages/profile/flightPlanner/FlightPlanNavlogPage.vue
new file mode 100644
index 0000000..44a6370
--- /dev/null
+++ b/src/pages/profile/flightPlanner/FlightPlanNavlogPage.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/pages/profile/flightPlanner/FlightPlanWeatherPage.vue b/src/pages/profile/flightPlanner/FlightPlanWeatherPage.vue
new file mode 100644
index 0000000..ed023ac
--- /dev/null
+++ b/src/pages/profile/flightPlanner/FlightPlanWeatherPage.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/router/routes.js b/src/router/routes.js
index cc58ad3..6c6db92 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -59,7 +59,17 @@ const routes = [
{path: 'plany', name: "flightPlans", component: () => import('pages/profile/flightPlanner/FlightPlansPage.vue')},
{path: 'plany/novy', name: "newFlightPlan", component: () => import('pages/profile/flightPlanner/NewFlightPlanPage.vue')},
- {path: 'plany/:id', name: "editFlightPlan", component: () => import('pages/profile/flightPlanner/FlightPlanEditPage.vue')},
+ {
+ path: 'plany/:id',
+ component: () => import('pages/profile/flightPlanner/FlightPlanEditPage.vue'),
+ children: [
+ {path: '', name: "editFlightPlan", component: () => import('pages/profile/flightPlanner/FlightPlanMapPage.vue')},
+ {path: 'pocasi', name: "editFlightPlanWeather", component: () => import('pages/profile/flightPlanner/FlightPlanWeatherPage.vue')},
+ {path: 'info', name: "editFlightPlanInfo", component: () => import('pages/profile/flightPlanner/FlightPlanInfoPage.vue')},
+ {path: 'let', name: "flightPlanFlight", component: () => import('pages/profile/flightPlanner/FlightPlanFlightPage.vue')},
+ {path: 'stitek', name: "editFlightPlanNavlog", component: () => import('pages/profile/flightPlanner/FlightPlanNavlogPage.vue')},
+ ]
+ },
{path: 'poi', name: "poi", component: () => import('pages/profile/poi/PointsOfInterestPage.vue')},
{path: 'poi/novy', name: "addPOI", component: () => import('pages/profile/poi/NewPointOfInterestPage.vue')},
diff --git a/yarn.lock b/yarn.lock
index 46d1276..98b0ad3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1632,17 +1632,18 @@ eslint-config-prettier@^8.10.0:
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
-eslint-plugin-vue@^9.19.2:
- version "9.19.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.19.2.tgz#7ab83a001a1ac8bccae013c5b9cb5d2c644fb376"
- integrity sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==
+eslint-plugin-vue@^9.28.0:
+ version "9.28.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz#e4412f0c1024bafd15ffeaa6f76f4c99152e2765"
+ integrity sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==
dependencies:
"@eslint-community/eslint-utils" "^4.4.0"
+ globals "^13.24.0"
natural-compare "^1.4.0"
nth-check "^2.1.1"
- postcss-selector-parser "^6.0.13"
- semver "^7.5.4"
- vue-eslint-parser "^9.3.1"
+ postcss-selector-parser "^6.0.15"
+ semver "^7.6.3"
+ vue-eslint-parser "^9.4.3"
xml-name-validator "^4.0.0"
eslint-scope@^7.1.1, eslint-scope@^7.2.2:
@@ -1989,7 +1990,7 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.2.3:
once "^1.3.0"
path-is-absolute "^1.0.0"
-globals@^13.19.0:
+globals@^13.19.0, globals@^13.24.0:
version "13.24.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
@@ -2755,10 +2756,10 @@ pinia@^2.0.33:
"@vue/devtools-api" "^6.5.0"
vue-demi ">=0.14.5"
-postcss-selector-parser@^6.0.13:
- version "6.0.13"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
- integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
+postcss-selector-parser@^6.0.15:
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+ integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -3042,13 +3043,18 @@ semver@^7.3.5:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.1.tgz#60bfe090bf907a25aa8119a72b9f90ef7ca281b2"
integrity sha512-f/vbBsu+fOiYt+lmwZV0rVwJScl46HppnOA1ZvIuBWKOTlllpyJ3bfVax76/OrhCH38dyxoDIA8K7uB963IYgA==
-semver@^7.3.6, semver@^7.5.4:
+semver@^7.3.6:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"
+semver@^7.6.3:
+ version "7.6.3"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+ integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
send@0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -3424,10 +3430,10 @@ vue-demi@^0.13.1:
resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-vue-eslint-parser@^9.3.1:
- version "9.3.2"
- resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz#6f9638e55703f1c77875a19026347548d93fd499"
- integrity sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==
+vue-eslint-parser@^9.4.3:
+ version "9.4.3"
+ resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"
+ integrity sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==
dependencies:
debug "^4.3.4"
eslint-scope "^7.1.1"