From 69de3b38745e9c918905bb22971016734bee11c7 Mon Sep 17 00:00:00 2001
From: Grzegorz Koperwas <admin@grzegorzkoperwas.site>
Date: Sun, 24 Apr 2022 20:25:05 +0200
Subject: [PATCH 1/2] Poprawki do ekranu PC

---
 .../editor/src/components/measurementRow.tsx  |  17 ++
 frontend/editor/src/pages/Pc.tsx              | 154 +++++++++++-------
 2 files changed, 115 insertions(+), 56 deletions(-)
 create mode 100644 frontend/editor/src/components/measurementRow.tsx

diff --git a/frontend/editor/src/components/measurementRow.tsx b/frontend/editor/src/components/measurementRow.tsx
new file mode 100644
index 0000000..8d70576
--- /dev/null
+++ b/frontend/editor/src/components/measurementRow.tsx
@@ -0,0 +1,17 @@
+import { Typography } from "@mui/material";
+
+interface RowProps {
+  name: string;
+  children: any;
+}
+
+export function MeasuermentRow(props: RowProps) {
+  const {name, children} = props;
+  return <>
+    <div className='measurement-row'>
+      <Typography variant="h6">{name}:</Typography>
+      <div className='w-24' />
+      <Typography variant="body1">{children}</Typography>
+    </div>
+  </>
+}
diff --git a/frontend/editor/src/pages/Pc.tsx b/frontend/editor/src/pages/Pc.tsx
index de170e4..30d86b9 100644
--- a/frontend/editor/src/pages/Pc.tsx
+++ b/frontend/editor/src/pages/Pc.tsx
@@ -1,38 +1,64 @@
-import { useState, useEffect } from "react";
-import { Button, CircularProgress, Typography } from "@mui/material";
+import { useState, useEffect, useReducer } from "react";
+import { Button, Chip, CircularProgress, LinearProgress, Typography } from "@mui/material";
 import { useSnackbar } from "notistack";
-import { DataService, FilesService, Measurement, Location } from "../api";
+import { DataService, FilesService, Measurement, Location, FileReference } from "../api";
 import { checkFiContainAllFiles } from "../utils/fileUtils";
+import { MeasuermentRow } from "../components/measurementRow";
 import _ from 'lodash';
 
+type CountAction = 
+  | { type: 'add', newFiles: number}
+  | { type: 'fileuploaded'};
+
+interface CountState {
+  max: number;
+  now: number;
+}
+
+function countReducer(state: CountState, action: CountAction): CountState {
+  switch (action.type) {
+  case 'add':
+    return {now: state.now + action.newFiles, max: action.newFiles};
+  case 'fileuploaded':
+    return {now: state.now - 1, max: state.max}
+  default:
+    throw new Error()
+  }
+}
+
 export default function MobileEdit() {
   const { enqueueSnackbar } = useSnackbar();
   const [measurements, setMeasurements] = useState<Measurement[]>();
+  const [uploadingFilesCount, dispatch] = useReducer(countReducer, {now: 0, max: 0});
 
   function showLocalization(localization: Location) {
     window.open(`https://www.google.com/maps/place/${localization.latitude} ${localization.longitude}`, "_blank");
   }
 
-  function send(id: number) {
+  async function send(id: number) {
     const input = document.getElementById(`${id}`) as HTMLInputElement;
     if(!input || !input.files) {
       return;
     }
-
+    dispatch({type: 'add', newFiles: input.files.length})
     for (const file of input.files) {
       let body = {
         uploaded_file: file
       }
-      FilesService.uploadNewFileApiFilesPost(id, body).then(() => {
+      try {
+        await FilesService.uploadNewFileApiFilesPost(id, body)
         enqueueSnackbar("The file was added", {
           variant: "success",
         });
-      }).catch(() => {
+      } 
+      catch {
         enqueueSnackbar(`Ops! We have some error with file upload check your internet connection or login again`, {
           variant: "error",
         });
-      });
+      }
+      dispatch({type: 'fileuploaded'})
     }      
+    await fetchData()
   }
 
   async function fetchData() {
@@ -44,6 +70,24 @@ export default function MobileEdit() {
     setMeasurements(measures);
   }
 
+  async function deleteFile(file: FileReference, e: Event) {
+    e.preventDefault()
+    if (confirm(`Do you really want to delete "${file.original_name}"?`)) {
+      try {
+        await FilesService.deleteFileApiFilesDeleteIdGet(file.file_id)
+        enqueueSnackbar(`Deleted ${file.original_name}`, {
+          variant: "success",
+        });
+      }
+      catch {
+        enqueueSnackbar(`Ops! Grzez failed to delete ${file.original_name}`, {
+          variant: "error",
+        });
+      }
+      await fetchData()
+    }
+  }
+
   useEffect(() => {
     fetchData();
   }, []);
@@ -61,54 +105,52 @@ export default function MobileEdit() {
             return (
               <div key={measurement.measurement_id}
                 className={checkFiContainAllFiles(measurement.files) ? "measurement bg-stone-800" : "measurement bg-stone-700" }>
-                <div className='measurement-row'>
-                  <Typography variant="h6">title:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="h6">{measurement.title}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">description:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.description}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">notes:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.notes}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">tags:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.tags.join(", ")}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">laeq:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.laeq}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">data:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.location.time}</Typography>
-                </div>
-                <div onClick={() => showLocalization(measurement.location)} className='measurement-row cursor-pointer'>
-                  <Typography variant="h6">localization:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">
-                    {measurement.location.latitude} {measurement.location.longitude}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <Typography variant="h6">files:</Typography>
-                  <div className='w-24' />
-                  <Typography variant="body1">{measurement.files.map((file, index, arr) => (
-                    <span key={file.file_id}>
-                      <a title={file?.optimized_mime} href={file.link}>{file.mime}</a>{index < arr.length - 1 ? ", " : ""}
-                    </span>
-                  ))}</Typography>
-                </div>
-                <div className='measurement-row'>
-                  <input type="file" name="multipleFiles" multiple id={String(measurement.measurement_id)} />
-                </div>
+                <Typography variant="h6">
+                  {measurement.title}
+                </Typography>
+                <MeasuermentRow name="description">
+                  {measurement.description}
+                </MeasuermentRow>
+                <MeasuermentRow name="notes">
+                  {measurement.notes}
+                </MeasuermentRow>
+                <MeasuermentRow name="tags">
+                  {measurement.tags.map(
+                    (tag, index) => <Chip key={tag + index} label={tag}/>)}
+                </MeasuermentRow>
+                <MeasuermentRow name="laeq">
+                  {measurement.laeq}
+                </MeasuermentRow>
+                <MeasuermentRow name="time">
+                  {new Date(Date.parse(measurement.location.time)).toLocaleString()}
+                </MeasuermentRow>
+                <MeasuermentRow name="location">
+                  <Chip 
+                    label={`${measurement.location.latitude} ${measurement.location.longitude}`} 
+                    onClick={() => showLocalization(measurement.location)}/>
+                </MeasuermentRow>
+                <MeasuermentRow name="files">
+                  {measurement.files.map((file) => <Chip 
+                    key={file.file_id} 
+                    label={file.original_name} 
+                    color={file.optimized_mime ? "success" : "primary"}
+                    component="a"
+                    title={file.mime}
+                    href={file.link}
+                    onDelete={(e) => deleteFile(file, e)}
+                    clickable
+                  />
+                  )}
+                </MeasuermentRow>
+                {uploadingFilesCount.now > 0 ? 
+                  <>
+                    <LinearProgress variant="determinate" value={100 - uploadingFilesCount.now / uploadingFilesCount.max * 100}/>
+                  </>
+                  : <>
+                    <div className='measurement-row'>
+                      <input type="file" name="multipleFiles" multiple id={String(measurement.measurement_id)} />
+                    </div>
+                  </>}
                 <div className='measurement-row-last'>
                   <Button type="submit" variant="contained" onClick={() => send(measurement.measurement_id)} >send</Button>
                   <Button type="submit" variant="contained" 

From d0d52def9a34ffcffb8ce49e1f8e87d8fa45b7e6 Mon Sep 17 00:00:00 2001
From: Grzegorz Koperwas <admin@grzegorzkoperwas.site>
Date: Sun, 24 Apr 2022 20:31:06 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Sortowanie=20pomiar=C3=B3w=20na=20backendzi?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/backend/measurements.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/backend/measurements.py b/backend/backend/measurements.py
index 0a6a9df..2df5db4 100644
--- a/backend/backend/measurements.py
+++ b/backend/backend/measurements.py
@@ -3,6 +3,7 @@
 from fastapi_users.fastapi_users import FastAPIUsers
 from sqlalchemy.sql import select, delete
 from sqlalchemy.ext.asyncio.session import AsyncSession
+from sqlalchemy.sql.expression import desc
 from starlette.responses import Response
 from fastapi_redis_cache import cache
 from .tasks import on_new_location
@@ -71,7 +72,7 @@ def _check_tags(
     async def get_all_measurements(
         self, session: AsyncSession
     ) -> list[Measurement]:
-        result = await session.execute(select(Measurements))
+        result = await session.execute(select(Measurements).order_by(Measurements.title))
         return [
             self._table_to_model(x) for x in result.unique().scalars().all()
         ]
@@ -141,7 +142,7 @@ async def get_my_measurements(
         result = await session.execute(
             select(Measurements).filter(
                 Measurements.author_id == current_user.id
-            )
+            ).order_by(desc(Measurements.location_time))
         )
         return [
             self._table_to_model(x) for x in result.unique().scalars().all()