Changeset 9dd526f for sources/app/src/main/java/parkup/data

Timestamp:

02/02/22 14:15:35 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

Location:

sources/app/src/main/java/parkup/data

Files:

• AddUpdateWorker.java (moved) (moved from sources/app/src/main/java/parkup/data/AddUpdateVraboten.java ) (2 diffs)
• Location.java (modified) (1 diff)
• ParkingZoneAdminView.java (modified) (3 diffs)
• ParkingZoneLocation.java (modified) (2 diffs)
• Plate.java (added)
• Tablicka.java (deleted)
• WorkerDemo.java (moved) (moved from sources/app/src/main/java/parkup/data/VrabotenDemo.java ) (2 diffs)
• WorkerDemoParkingZones.java (added)
• enumarations/UserRole.java (added)

sources/app/src/main/java/parkup/data/AddUpdateWorker.java

@@ -5 +5 @@
 import java.util.List;
 
-public class AddUpdateVraboten {
+public class AddUpdateWorker {
     String firstName;
     String lastName;
@@ -16 +16 @@
     boolean locked;
 
-    public AddUpdateVraboten(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobileNumber, boolean locked) {
+    public AddUpdateWorker(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobileNumber, boolean locked) {
         this.firstName = firstName;
         this.lastName = lastName;

sources/app/src/main/java/parkup/data/Location.java

@@ -19 +19 @@
     private int locationId;
 
-    private float longitude;
+    private float lng;
 
-    private float latitude;
+    private float lat;
 
     public Location(){}
 
-    public Location(float longtitude, float latitude) {
-        this.longitude = longtitude;
-        this.latitude = latitude;
+    public Location(float lng, float lat) {
+        this.lng = lng;
+        this.lat = lat;
     }
 
-    public float getLongitude() {
-        return longitude;
+    public float getLng() {
+        return lng;
     }
 
-    public void setLongitude(float longitude) {
-        this.longitude = longitude;
+    public void setLng(float lng) {
+        this.lng = lng;
     }
 
-    public float getLatitude() {
-        return latitude;
+    public float getLat() {
+        return lat;
     }
 
-    public void setLatitude(float latitude) {
-        this.latitude = latitude;
+    public void setLat(float lat) {
+        this.lat = lat;
     }
 }

sources/app/src/main/java/parkup/data/ParkingZoneAdminView.java

@@ -15 +15 @@
     private List<ParkingSpace> parkingSpaces;
     private ParkingZoneLocation parkingZoneLocation;
-    private List<Integer> odgovorniLica;
+    private List<Integer> responsibleWorkers;
 
-    public ParkingZoneAdminView(int pzId, String pzName, int price, int time_from, int time_to, String address, String color, List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List<Integer> odgovorniLica) {
+    public ParkingZoneAdminView(int pzId, String pzName, int price, int time_from, int time_to, String address, String color, List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List<Integer> responsibleWorkers) {
         this.pzId = pzId;
         this.pzName = pzName;
@@ -27 +27 @@
         this.parkingSpaces = parkingSpaces;
         this.parkingZoneLocation = parkingZoneLocation;
-        this.odgovorniLica = odgovorniLica;
+        this.responsibleWorkers = responsibleWorkers;
     }
 
@@ -104 +104 @@
     }
 
-    public List<Integer> getOdgovorniLica() {
-        return odgovorniLica;
+    public List<Integer> getResponsibleWorkers() {
+        return responsibleWorkers;
     }
 
-    public void setOdgovorniLica(List<Integer> odgovorniLica) {
-        this.odgovorniLica = odgovorniLica;
+    public void setResponsibleWorkers(List<Integer> responsibleWorkers) {
+        this.responsibleWorkers = responsibleWorkers;
     }
 }

sources/app/src/main/java/parkup/data/ParkingZoneLocation.java

@@ -24 +24 @@
 
     @OneToMany(cascade = {CascadeType.ALL})
-    private List<Location> teminja;
+    private List<Location> coords;
 
-    public ParkingZoneLocation(int parkingZoneLocationId, Location centre, List<Location> teminja) {
+    public ParkingZoneLocation(int parkingZoneLocationId, Location centre, List<Location> coords) {
         this.parkingZoneLocationId = parkingZoneLocationId;
         this.centre = centre;
-        this.teminja = teminja;
+        this.coords = coords;
     }
 
-    public ParkingZoneLocation(Location centre, List<Location> teminja) {
+    public ParkingZoneLocation(Location centre, List<Location> coords) {
         this.centre = centre;
-        this.teminja = teminja;
+        this.coords = coords;
     }
 
@@ -47 +47 @@
     }
 
-    public List<Location> getTeminja() {
-        return teminja;
+    public List<Location> getCoords() {
+        return coords;
     }
 
-    public void setTeminja(List<Location> teminja) {
-        this.teminja = teminja;
+    public void setCoords(List<Location> teminja) {
+        this.coords = teminja;
     }
 }

sources/app/src/main/java/parkup/data/WorkerDemo.java

@@ -1 +1 @@
 package parkup.data;
 
-public class VrabotenDemo {
-    private int vrabotenId;
+public class WorkerDemo {
+    private int workerId;
     private String firstName;
     private String lastName;
     private String email;
 
-    public VrabotenDemo() {}
+    public WorkerDemo() {}
 
-    public VrabotenDemo(int id,String firstName, String lastName, String email) {
-        this.vrabotenId=id;
+    public WorkerDemo(int id, String firstName, String lastName, String email) {
+        this.workerId =id;
         this.firstName = firstName;
         this.lastName = lastName;
@@ -16 +16 @@
     }
 
-    public int getVrabotenId() {
-        return vrabotenId;
+    public int getWorkerId() {
+        return workerId;
     }
 
-    public void setVrabotenId(int vrabotenId) {
-        this.vrabotenId = vrabotenId;
+    public void setWorkerId(int workerId) {
+        this.workerId = workerId;
     }