Versio 2.0.2

Signed-off-by: laurimaaninka <lauri.maaninka@gmail.com>

CHANGELOG.md

@@ -1,4 +1,11 @@
+# 2.0.2
+- Korjattu virhe kierroksen asiakkaiden hakemisessa, joka aiheutti vääriä järjestyksiä kierroksella
+
+# 2.0.1
+- Vaihdettu versioloki avautumaan paikallisena tiedostona
+
 # 2.0.0
+### Palaaminen aiempaan versioon ei tuettu
 - Asiakkaalle lisätty tietoihin laskutusosoite ja yhteyshenkilön yhteystiedot
 - Tiedot nousevat kuljetusraportille laskutusta varten
 - Lisätty ohjelmaan linkki muutoslokiin

LICENSE

@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Lauri Maaninka
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   

README.md

@@ -1,4 +1,6 @@
-## [Versiohistoria](CHANGELOG.md)
+# [LICENSE](LICENSE)
+
+# [Versiohistoria](CHANGELOG.md)
 
 # Kuvaus 
 Pienen kotiateriapalvelun käyttöön rakennettu ohjelma sisältäen seuraavat ominaisuudet

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.lpam.ruokamanageri</groupId>
     <artifactId>Ruokamanageri</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>25</maven.compiler.source>

src/main/java/fi/lpam/ruokamanageri/Main.java

@@ -20,6 +20,7 @@ public class Main {
             properties.load(Main.class.getClassLoader().getResourceAsStream("app.properties"));
         }
         catch (IOException e) {
+            //noinspection CallToPrintStackTrace
             e.printStackTrace();
         }
 

src/main/java/fi/lpam/ruokamanageri/dataluokat/Asiakas.java

@@ -106,7 +106,7 @@ public class Asiakas implements TietokantaOlio {
     }
 
     /**
-     * Hakee tietokannasta asiakasidn perusteella asiakkaat
+     * Hakee tietokannasta asiakasidn perusteella asiakkaat ja palauttaa ne annetussa järjestyksessä
      * @param IDt haettavat asiakkkaat
      * @return Haetut asiakkaat tai null
      */
@@ -120,7 +120,17 @@ public class Asiakas implements TietokantaOlio {
             String sql = "select * from asiakkaat where id in (" + sbIDt + ") order by instr('" + sbIDt + "', id)";
             Statement stmt = tietokanta.createStatement();
             ResultSet rs = stmt.executeQuery(sql);
-            return parsiResultSet(rs);
+            ArrayList<Asiakas> asiakkaat =  parsiResultSet(rs);
+
+            ArrayList<Asiakas> järjestetyt = new ArrayList<Asiakas>();
+            for (int id : IDt) {
+                for (Asiakas asiakas : asiakkaat) {
+                    if (asiakas.getId() == id) {
+                        järjestetyt.add(asiakas);
+                    }
+                }
+            }
+            return järjestetyt;
         }
         catch (SQLException e) {
             SiirtoVirhe alert = new SiirtoVirhe(e);

src/main/java/fi/lpam/ruokamanageri/dataluokat/Kuljetus.java

@@ -68,36 +68,6 @@ public class Kuljetus implements TietokantaOlio {
         this.ruokarajoite = ruokarajoite;
     }
 
-    public static ArrayList<Kuljetus> haeKaikki() {
-        try (Connection tietokanta = Tietokanta.haeYhteys()) {
-            Statement stmt = tietokanta.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM kuljetukset;");
-            return parsiResultSet(rs);
-        } catch (SQLException e) {
-            SiirtoVirhe virhe = new SiirtoVirhe(e);
-            virhe.showAndWait();
-            return null;
-        }
-    }
-
-    /**
-     * Hakee yhden päivän kuljetukset riippumatta kierroksesta
-     * @param päivä haettava päivä
-     * @return päivän kuljetukset
-     */
-    public static ArrayList<Kuljetus> haePäivänKuljetukset(LocalDate päivä) {
-        try (Connection tietokanta = Tietokanta.haeYhteys()) {
-            PreparedStatement stmt = tietokanta.prepareStatement("SELECT * FROM kuljetukset WHERE kuljetusPäivämäärä = ?;");
-            stmt.setDate(1, Date.valueOf(päivä));
-            ResultSet rs = stmt.executeQuery();
-            return parsiResultSet(rs);
-        } catch (SQLException e) {
-            SiirtoVirhe virhe = new SiirtoVirhe(e);
-            virhe.showAndWait();
-            return null;
-        }
-    }
-
     /**
      * Hakee tietyn kierroksen kuljetukset
      * @param päivä kierroksen päivä
@@ -117,41 +87,6 @@ public class Kuljetus implements TietokantaOlio {
             return null;
         }
     }
-    /**
-     * Hakee kuljetukset aikajakson perusteella
-     *
-     * @param alku  jakson alku (sisältyen)
-     * @param loppu jakson loppu (sisältyen)
-     * @return Jakson kuljetukset
-     */
-    public static ArrayList<Kuljetus> haeAikaJakso(LocalDate alku, LocalDate loppu) {
-        try (Connection tietokanta = Tietokanta.haeYhteys()) {
-            PreparedStatement stmt = tietokanta.prepareStatement("SELECT * FROM kuljetukset WHERE kuljetusPäivämäärä BETWEEN ? AND ?");
-            stmt.setDate(1, Date.valueOf(alku));
-            stmt.setDate(2, Date.valueOf(loppu));
-            ResultSet rs = stmt.executeQuery();
-            return parsiResultSet(rs);
-        } catch (SQLException e) {
-            SiirtoVirhe virhe = new SiirtoVirhe(e);
-            virhe.showAndWait();
-            return null;
-        }
-    }
-
-    public static ArrayList<Kuljetus> haeAikaJaksollaJaKierroksella(LocalDate alku, LocalDate loppu, int kuljetusKierros) {
-        try (Connection tietokanta = Tietokanta.haeYhteys()) {
-            PreparedStatement stmt = tietokanta.prepareStatement("SELECT * FROM kuljetukset WHERE kuljetusKierros = ? and kuljetusPäivämäärä BETWEEN ? AND ?");
-            stmt.setInt(1, kuljetusKierros);
-            stmt.setDate(2, Date.valueOf(alku));
-            stmt.setDate(3, Date.valueOf(loppu));
-            ResultSet rs = stmt.executeQuery();
-            return parsiResultSet(rs);
-        } catch (SQLException e) {
-            SiirtoVirhe virhe = new SiirtoVirhe(e);
-            virhe.showAndWait();
-            return null;
-        }
-    }
 
     @Override
     public boolean tallennaUusi() {

src/main/java/fi/lpam/ruokamanageri/gui/Asiakashallinta.java

@@ -1,6 +1,5 @@
 package fi.lpam.ruokamanageri.gui;
 
-import fi.lpam.ruokamanageri.Main;
 import fi.lpam.ruokamanageri.dataluokat.Asiakas;
 import fi.lpam.ruokamanageri.gui.elementit.MaaraTableColumn;
 import fi.lpam.ruokamanageri.gui.elementit.TabPohja;
@@ -14,11 +13,8 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 
 import java.awt.*;
+import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -46,8 +42,8 @@ public class Asiakashallinta extends TabPohja {
         avaaVersioloki.setFont(buttonFont);
         avaaVersioloki.setOnAction(_ -> {
             try {
-                Desktop.getDesktop().browse(new URI("https://git.lpam.fi/laurimaaninka/Ruokamanageri/src/branch/master/CHANGELOG.md"));
+                Desktop.getDesktop().browse(new File("CHANGELOG.md").toURI());
-            } catch (IOException | URISyntaxException e) {
+            } catch (IOException e) {
                 System.out.println(e.getMessage());
             }
         });

src/main/java/fi/lpam/ruokamanageri/gui/Kierroshallinta.java

@@ -104,6 +104,7 @@ public class Kierroshallinta extends TabPohja {
         int index = 0;
         for (int i = 0; i < kierrokset.size();) {
             Kierros k = kierrokset.get(i);
+            k.setAsiakkaat(FXCollections.observableArrayList(new ArrayList<>()));
             k.setAsiakkaat(mclv.getColumns().get(index).getItems());
             index++;
 

src/main/java/fi/lpam/ruokamanageri/gui/elementit/IntegerSpinner.java

@@ -11,14 +11,4 @@ public class IntegerSpinner extends Spinner<Integer> {
         super(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 50));
         this.setEditable(true);
     }
-
-    /**
-     *
-     * @param min _
-     * @param max _
-     */
-    public IntegerSpinner(int min, int max) {
-        super(new SpinnerValueFactory.IntegerSpinnerValueFactory(min, max));
-        this.setEditable(true);
-    }
 }

src/main/java/fi/lpam/ruokamanageri/gui/virheDialogit/YhteysVirhe.java

@@ -1,8 +0,0 @@
-package fi.lpam.ruokamanageri.gui.virheDialogit;
-
-public class YhteysVirhe extends TietokantaVirhe{
-    public YhteysVirhe(Exception error){
-        this.setHeaderText("Virhe yhdistäessä tietokantaan");
-        this.setContentText(error.getMessage());
-    }
-}

src/main/java/fi/lpam/ruokamanageri/tulostajat/KuljetusListaTulostaja.java

@@ -6,7 +6,6 @@ import javafx.collections.ObservableList;
 import java.io.IOException;
 import java.time.format.DateTimeFormatter;
 
-@SuppressWarnings("DuplicatedCode")
 public class KuljetusListaTulostaja extends Tulostaja{
     final float NIMEN_LEVEYS = 200;
     final float OSOITTEEN_LEVEYS = 200;

src/main/java/fi/lpam/ruokamanageri/tulostajat/KuljetusRaporttiTulostaja.java

@@ -7,7 +7,6 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 
-@SuppressWarnings("DuplicatedCode")
 public class KuljetusRaporttiTulostaja extends Tulostaja {
     public void luoRaportti(ArrayList<RaporttiRivi> raporttiRivit, LocalDate alkuPvm, LocalDate loppuPvm) {
         try {

src/main/java/fi/lpam/ruokamanageri/tulostajat/Tulostaja.java

@@ -15,18 +15,18 @@ import java.awt.print.PrinterJob;
 import java.io.IOException;
 
 public abstract class Tulostaja {
-    PDRectangle SIVUKOKO = PDRectangle.A4;
+    final PDRectangle SIVUKOKO = PDRectangle.A4;
     final PDFont FONTTI = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
     final float FONTTI_KOKO = 13;
     final float MARGINAALI = 50;
     final float RIVI_KORKEUS = FONTTI_KOKO * 1.2F;
 
-    PDDocument dokumentti;
+    final PDDocument dokumentti;
     PDPage nykyinenSivu = null;
     PDPageContentStream sisältö = null;
-    float sivunLeveys;
+    final float sivunLeveys;
-    float startX;
+    final float startX;
-    float startY;
+    final float startY;
     float yOffset;
     float xOffset;
 
@@ -78,7 +78,7 @@ public abstract class Tulostaja {
      uusiRivi(RIVI_KORKEUS);
     }
     /**Siirtää osoitinta sivulla. + oikealle, - vasemmalle*/
-    void siirräOsoitinta(float tX) {
+    void siirräOsoitinta(@SuppressWarnings("SameParameterValue") float tX) {
      try {
          sisältö.newLineAtOffset(tX, 0);
          xOffset += tX;