fixing page totals

updating version number to 1.4.0
adding skeleton loader to flights page
2025-05-25 08:32:22 -05:00 · 2025-05-16 12:50:26 -05:00 · 2025-05-16 11:23:20 -05:00 · 2025-05-16 11:16:07 -05:00 · 2025-05-16 10:24:27 -05:00 · 2025-05-16 10:14:28 -05:00
9 changed files with 783 additions and 319 deletions
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "api",
-  "version": "1.3.0",
+  "version": "1.4.0",
  "description": "",
  "author": "",
  "private": true,
--- a/app/index.html
+++ b/app/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/noahspan-logo.png" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Flying</title>
  </head>
  <body>
    <div id="root"></div>
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "app",
  "private": true,
-  "version": "1.3.0",
+  "version": "1.4.0",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -13,7 +13,7 @@
  "dependencies": {
    "@azure/msal-browser": "^4.0.1",
    "@azure/msal-react": "^3.0.1",
-    "@noahspan/noahspan-components": "1.6.0",
+    "@noahspan/noahspan-components": "^1.9.1",
    "axios": "^1.7.2",
    "dotenv": "^16.4.7",
    "leaflet": "^1.9.4",
--- a/app/src/components/flights/Flights.tsx
+++ b/app/src/components/flights/Flights.tsx
@@ -1,4 +1,4 @@
-import { Box, Container, Grid, Spinner } from "@noahspan/noahspan-components";
+import { Box, Card, CardContent, Container, Grid, Skeleton, Spinner, Stack, theme, Typography, useMediaQuery } from "@noahspan/noahspan-components";
 import LogbookCard from "../logbookCard/LogbookCard";
 import { useEffect, useState } from "react";
 import { useLogs } from "../../hooks/logs/UseLogs";
@@ -7,6 +7,7 @@ import { ILogbookEntry } from "../logbook/ILogbookEntry";
 const Flights = () => {
  const [flights, setFlights] = useState<ILogbookEntry[]>([]);
  const { logs, isLoading } = useLogs();
+  const isMedium = useMediaQuery(theme.breakpoints.up('md'));

  useEffect(() => {
    const flights: ILogbookEntry[] | undefined = logs?.filter((log: ILogbookEntry) => {
@@ -24,21 +25,48 @@ const Flights = () => {
    <Container>
      <Box sx={{ margin: '20px' }}>
        <Grid container spacing={2}>
-          {isLoading &&
-            <>
-              <Grid display="flex" justifyContent="center" size={12}>
-                <Spinner />
-              </Grid>
-              <Grid display="flex" justifyContent="center" size={12}>
-                Loading...
-              </Grid>
-            </>
-          }
+          <Grid size={isMedium ? 11 : 6}>
+            <Typography variant="h4">Flights</Typography>
+          </Grid>
          {!isLoading &&
            <Grid size={12}>
              <LogbookCard logs={flights} mode='flights' />
            </Grid>
          }
+          {isLoading && [...Array(6)].map((_element, index) => {
+            return (
+              <Grid display='flex' justifyContent='center' size={12}>
+                <Card
+                  key={index}
+                  sx={{
+                    width: '100%'
+                  }}
+                >
+                  <CardContent>
+                    <Grid container>
+                      <Grid size={12}>
+                        <Skeleton height={60} width={200} />
+                        <Skeleton height={30} width={200} />
+                      </Grid>
+                      <Grid size={12}>
+                        <Skeleton height={300} />
+                      </Grid>
+                      <Grid size={12}>
+                        {[...Array(4)].map((_element, index) => {
+                          return (
+                            <>
+                              <Skeleton height={20} width={300} />
+                              <Skeleton height={40} width={300} />
+                            </>
+                          )
+                        })}
+                      </Grid>
+                    </Grid>
+                  </CardContent>
+                </Card>
+              </Grid>
+            )
+          })}
        </Grid>
      </Box>
    </Container>
--- a/app/src/components/logTrackMaps/LogTrackMaps.tsx
+++ b/app/src/components/logTrackMaps/LogTrackMaps.tsx
@@ -4,8 +4,6 @@ import { useHttpClient } from '../../hooks/httpClient/UseHttpClient';
 import { AxiosInstance, AxiosResponse } from 'axios';
 import { useAccessToken } from '../../hooks/accessToken/UseAcessToken';
 import { useIsAuthenticated } from '@azure/msal-react';
-import { Swiper, SwiperSlide } from 'swiper/react';
-import { Pagination } from 'swiper/modules';
 import { MapContainer, TileLayer } from 'react-leaflet';
 import ReactLeafletKml from 'react-leaflet-kml';
 import 'swiper/css';
@@ -46,35 +44,20 @@ const LogTrackMaps = ({ rowKey, trackUrls }: LogTrackMapsProps) => {
  }, [trackUrls])

  return (
-    <>
-      <Swiper
-        spaceBetween={30}
-        pagination={{
-          clickable: true,
-        }}
-        modules={[Pagination]}
-        className="mySwiper"
-      >
-        {tracks.length > 0 && tracks.map((track) => {
-          return (
-            <SwiperSlide>
-              <MapContainer 
-                center={[45.14489, -93.21019]} 
-                scrollWheelZoom={false}
-                style={{ height: '500px', width: '100%' }}
-                zoom={8}
-              >
-                <TileLayer
-                  attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-                  url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-                />
-                <ReactLeafletKml kml={track} />
-              </MapContainer>
-            </SwiperSlide>
-          )
-        })}
-      </Swiper>
-    </>
+    <MapContainer 
+      center={[45.14489, -93.21019]} 
+      scrollWheelZoom={false}
+      style={{ height: '500px', width: '100%' }}
+      zoom={8}
+    >
+      <TileLayer
+        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+        url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+      />
+      {tracks.length > 0 && tracks.map((track) => (
+        <ReactLeafletKml kml={track} />
+      ))}
+    </MapContainer>
  );
 }

--- a/app/src/components/logTracks/LogTracks.tsx
+++ b/app/src/components/logTracks/LogTracks.tsx
@@ -56,7 +56,7 @@ const LogTracks = ({ isDrawerOpen, mode, onOpenClose, selectedRowKey }: LogTrack
      const uploadResponse: AxiosResponse = await httpClient.post(`api/logs/log/${selectedRowKey}/track`, formData, formDataConfig);
      const uploadUrl = uploadResponse.data.url;
      const log = await getLog();
-      const tracks: string[] = JSON.parse(log.tracks!);
+      const tracks: string[] = log.tracks ? JSON.parse(log.tracks!) : [];

      tracks.push(uploadUrl)
      log.tracks = JSON.stringify(tracks);
@@ -171,7 +171,7 @@ const LogTracks = ({ isDrawerOpen, mode, onOpenClose, selectedRowKey }: LogTrack
                onClick={onCancel}
                size="small"
              >
-                {mode.toString() !== FormMode.VIEW ? 'Cancel' : 'Close'}
+                Close
              </Button>
              {mode.toString() !== FormMode.VIEW && (
                <Button
--- a/app/src/components/logbook/columns.tsx
+++ b/app/src/components/logbook/columns.tsx
@@ -1,15 +1,27 @@
 import {
+  CellContext,
  ColumnDef,
-  Icon,
-  IconButton,
-  IconName
+  HeaderContext,
 } from '@noahspan/noahspan-components';
 import { ILogbookEntry } from './ILogbookEntry';

+const columnTotal = (info: HeaderContext<ILogbookEntry, unknown>): number => {
+  const blah = info.table
+  const values: number[] = info.table.getPaginationRowModel().rows.map((row: any) => Number(row.getValue(info.column.id))).filter((value: any) => !Number.isNaN(value));
+  let total: number = 0;
+  
+  if (values.length > 0) {
+    total = values.reduce((accumulator, currentValue) => accumulator + currentValue, total)
+  }
+
+  return total;
+} 
+
 const pilotName: ColumnDef<ILogbookEntry> = {
  id: 'pilotName',
  accessorKey: 'pilotName',
-  header: 'Pilot'
+  header: 'Pilot',
+  footer: 'PAGE TOTALS'
 }
 const date: ColumnDef<ILogbookEntry> = {
  id: 'date',
@@ -48,8 +60,9 @@ const durationOfFlight: ColumnDef<ILogbookEntry> = {
    align: 'right',
    headerAlign: 'right'
  },
-  cell: (info: any) =>
-    info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+  cell: (info: CellContext<ILogbookEntry, unknown>) =>
+    info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
+  footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : ''
 }
 const notes: ColumnDef<ILogbookEntry> = {
  id: 'notes',
@@ -85,8 +98,9 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
      align: 'right',
      headerAlign: 'right'
    },
-    cell: (info: any) =>
-      info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+    cell: (info: CellContext<ILogbookEntry, unknown>) =>
+      info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
+    footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : ''
  },
  {
    id: 'landings',
@@ -99,6 +113,7 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'landingsDay',
        accessorKey: 'landingsDay',
        header: 'Day',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
@@ -108,6 +123,7 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'landingsNight',
        accessorKey: 'landingsNight',
        header: 'Night',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
@@ -126,28 +142,31 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'instrumentActual',
        accessorKey: 'instrumentActual',
        header: 'Actual',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
      },
      {
        id: 'instrumentSimulated',
        accessorKey: 'instrumentSimulated',
        header: 'Simulated',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'instrumentApproaches',
        accessorKey: 'instrumentApproaches',
        header: 'Approaches',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
@@ -157,6 +176,7 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'instrumentHolds',
        accessorKey: 'instrumentHolds',
        header: 'Holds',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
@@ -166,6 +186,7 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'instrumentNavTrack',
        accessorKey: 'instrumentNavTrack',
        header: 'Nav/Track',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
@@ -184,67 +205,73 @@ export const authColumns: ColumnDef<ILogbookEntry>[] = [
        id: 'groundTrainingReceived',
        accessorKey: 'groundTrainingReceived',
        header: 'Ground Training Received',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'flightTrainingReceived',
        accessorKey: 'flightTrainingReceived',
        header: 'Flight Training Received',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'crossCountry',
        accessorKey: 'crossCountry',
        header: 'Cross Country',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'night',
        accessorKey: 'night',
        header: 'Night',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'solo',
        accessorKey: 'solo',
        header: 'Solo',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      },
      {
        id: 'pilotInCommand',
        accessorKey: 'pilotInCommand',
        header: 'Pilot In Command',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
        meta: {
          align: 'right',
          headerAlign: 'right'
        },
-        cell: (info: any) =>
-          info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
      }
    ]
  },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@noahspan/flying",
-  "version": "1.3.0",
+  "version": "1.4.0",
  "scripts": {
    "start": "concurrently 'npm run start:azure -w api' 'wait-on tcp:0.0.0.0:7071 && npm run dev -w app'",
    "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Noah Spannbauer	a866480b47	fixing page totals	2025-05-25 08:32:22 -05:00
Noah Spannbauer	fc5811c3b6	updating version number to 1.4.0	2025-05-16 12:50:26 -05:00
Noah Spannbauer	9833bc6593	adding skeleton loader to flights page	2025-05-16 11:23:20 -05:00
noahspannbauer	8d1842efa7	adding skeleton loader to flights page (#91 )	2025-05-16 11:16:07 -05:00
noahspannbauer	294766b8da	add totals to logbook table (#90 ) * adding logbook page totals * adding logbook page totals * adding logbook page totals * adding logbook page totals	2025-05-16 10:24:27 -05:00
noahspannbauer	c5f9dcce73	adding logbook page totals (#89 ) * adding logbook page totals * adding logbook page totals * adding logbook page totals	2025-05-16 10:14:28 -05:00
noahspannbauer	a185abf6d8	display multiple kml files on same leaflet map component (#88 ) * display multiple kml files on same leaflet map component * display multiple kml files on same leaflet map component	2025-05-12 19:18:03 -05:00
Noah Spannbauer	9f13cc20a5	Upating version number to 1.3.1	2025-05-06 13:06:57 -05:00
noahspannbauer	3ab9024152	fixing track parsing error for new log entries (#85 )	2025-05-06 12:58:00 -05:00