Changeset 9ff45d6 for sources/app/src/main/java/parkup/entities/ParkingZone.java

Timestamp:

12/24/21 23:31:23 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

9dd526f

Parents:

8588fcb

Message:

Fixed some functionalities related to parkingSessions and parkingZones

File:

• sources/app/src/main/java/parkup/entities/ParkingZone.java (modified) (6 diffs)

sources/app/src/main/java/parkup/entities/ParkingZone.java

@@ -30 +30 @@
     private int price;
 
+    @Transient
     @Column(name = "capacity")
     private int capacity;
-
-<<<<<<< HEAD
     @Column(name = "time_from")  //za rabotni casovi od:
     private int from;
 
     @Column(name = "time_to")    //za rabotni casovi do:
-=======
-    @Column(name = "vreme_od")  //za rabotni casovi od:
-    private int from;
-
-    @Column(name = "vreme_do")    //za rabotni casovi do:
->>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     private int to;
 
-    @Column(name = "lokacija")
-    private String location;
+    @Column(name = "address")
+    private String address;
 
+    @Transient
     @Column(name = "zafateniMesta")
-    private int zafateniMesta;
+    private int takenSpaces;
 
     @Column(name = "color")
     private String color;
 
-    @ManyToMany(cascade = {CascadeType.ALL})
-    @JoinColumn(name="odgovorniLica",nullable = true)
-    private List<Vraboten> odgovorniLica;
+//    @ManyToMany(cascade = {CascadeType.ALL})
+//    private List<Vraboten> odgovorniLica;
 
-    @OneToMany(cascade = {CascadeType.ALL})
+    @OneToMany(cascade = {CascadeType.MERGE})
     private List<ParkingSpace> parkingSpaces;
+
+
 
     @OneToOne(cascade = {CascadeType.ALL})
@@ -66 +61 @@
 
    public ParkingZone() {
-       this.zafateniMesta = 0;
+       this.takenSpaces = 0;
        this.parkingSpaces = new ArrayList<ParkingSpace>();
    }
@@ -72 +67 @@
     public ParkingZone(String pzName) {
         this.pzName = pzName;
-        this.zafateniMesta = 0;
+        this.takenSpaces = 0;
         this.parkingSpaces = new ArrayList<ParkingSpace>();
     }
 
-    public ParkingZone(int pzId, String pzName, int price, int capacity, String location, List<ParkingSpace> parkingSpaces, String color, int from, int to) {
+    public ParkingZone(int pzId, String pzName, int price, int capacity, String address, List<ParkingSpace> parkingSpaces, String color, int from, int to) {
         this.pzId = pzId;
         this.pzName = pzName;
         this.price = price;
         this.capacity = capacity;
-        this.location = location;
-        this.zafateniMesta = 0;
+        this.address = address;
+        this.takenSpaces = 0;
         this.parkingSpaces = parkingSpaces;
         this.color = color;
@@ -89 +84 @@
     }
 
-    public ParkingZone(String pzName, int price, int capacity, String location, List<ParkingSpace> parkingSpaces, String color, int from, int to) {
+    public ParkingZone(String pzName, int price, int capacity, String address, List<ParkingSpace> parkingSpaces, String color, int from, int to) {
         this.pzName = pzName;
         this.price = price;
         this.capacity = capacity;
-        this.location = location;
-        this.zafateniMesta = 0;
+        this.address = address;
+        this.takenSpaces = 0;
         this.parkingSpaces = parkingSpaces;
         this.color = color;
@@ -133 +128 @@
     }
 
-    public String getLocation() {
-        return this.location;
+    public String getAddress() {
+        return this.address;
     }
 
-    public void setLocation(String location) {
-        this.location = location;
+    public void setAddress(String location) {
+        this.address = location;
     }
 
-    public int getZafateniMesta() {return zafateniMesta;}
+    public int getTakenSpaces() {return takenSpaces;}
 
-    public void setZafateniMesta(int zafateniMesta) {this.zafateniMesta = zafateniMesta;}
+    public void setTakenSpaces(int takenSpaces) {this.takenSpaces = takenSpaces;}
 
     public List<ParkingSpace> getParkingSpaces() {return parkingSpaces;}
@@ -181 +176 @@
     }
 
-    public List<Vraboten> getOdgovorniLica() {
-        return odgovorniLica;
-    }
-
-    public void setOdgovorniLica(List<Vraboten> odgovorniLica) {
-        this.odgovorniLica = odgovorniLica;
-    }
+    //    public List<Vraboten> getOdgovorniLica() {
+//        return odgovorniLica;
+//    }
+//
+//    public void setOdgovorniLica(List<Vraboten> odgovorniLica) {
+//        this.odgovorniLica = odgovorniLica;
+//    }
 }