Changeset 2ace8f0 for sources/app/src/main/java/parkup/entities/ParkingSpace.java

Timestamp:

11/11/21 11:59:35 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

8588fcb

Parents:

97fbc67 (diff), 9504a09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

File:

• sources/app/src/main/java/parkup/entities/ParkingSpace.java (modified) (4 diffs)

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

@@ -31 +31 @@
     @Column(name = "latitude")
     private float lat;
+<<<<<<< HEAD
 
     @Column(name = "longitude")
@@ -43 +44 @@
     }
 
+=======
+
+    @Column(name = "longitude")
+    private float lng;
+
+    @OneToOne(cascade = {CascadeType.ALL})
+    @JoinColumn(name = "parking_zona")
+    private ParkingZone parkingZone;
+
+    public ParkingSpace() {}
+
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     public ParkingSpace(int psId, String psName, boolean isTaken, boolean isHandicaped, float lat, float lng) {
         this.psId = psId;
@@ -107 +120 @@
         this.lng = lng;
     }
+<<<<<<< HEAD
 
     @Override
@@ -118 +132 @@
                 '}';
     }
+=======
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
 }