Index: .idea/dataSources.local.xml =================================================================== --- .idea/dataSources.local.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ .idea/dataSources.local.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,25 @@ + + + + + + " + + + master_key + postgres + + + + + + + + + + + + + + + Index: .idea/material_theme_project_new.xml =================================================================== --- .idea/material_theme_project_new.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ .idea/material_theme_project_new.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,13 @@ + + + + + + Index: .idea/sqldialects.xml =================================================================== --- .idea/sqldialects.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ .idea/sqldialects.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,6 @@ + + + + + + Index: .idea/workspace.xml =================================================================== --- .idea/workspace.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ .idea/workspace.xml (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "borisdz" + } +} + { + "selectedUrlAndAccountId": { + "url": "https://github.com/borisdz/DistributorApp-Web.git", + "accountId": "42d6d1b9-22a6-48cc-aff8-eee9bbb182c2" + } +} + + + {} + { + "isMigrated": true +} + + + + + + + + { + "associatedIndex": 4 +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1730812526489 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -3,5 +3,5 @@ import jakarta.persistence.*; import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import java.time.LocalDate; @@ -38,5 +38,5 @@ @ManyToOne @JoinColumn(name = "del_status_id", nullable = false) - private Delivery_Status deliveryStatus; + private DeliveryStatus deliveryStatus; @ManyToOne Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -3,5 +3,5 @@ import jakarta.persistence.*; import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import java.time.LocalDate; @@ -32,5 +32,5 @@ @ManyToOne @JoinColumn(name = "ord_status_id") - private Order_Status orderStatus; + private OrderStatus orderStatus; @ManyToOne Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/ProForma.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -3,5 +3,5 @@ import jakarta.persistence.*; import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import java.time.LocalDate; @@ -24,5 +24,5 @@ @ManyToOne @JoinColumn(name = "pf_status_id", nullable = false) - private Pro_Forma_Status proFormaStatus; + private ProFormaStatus proFormaStatus; @OneToOne(mappedBy = "proForma") Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/DeliveryStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/DeliveryStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/DeliveryStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,25 @@ +package mk.ukim.finki.db.distributorapp.model.statuses; + +import jakarta.persistence.*; +import lombok.Data; +import mk.ukim.finki.db.distributorapp.model.Delivery; + +import java.util.List; + +@Entity +@Data +public class DeliveryStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "del_status_id") + private Short delivery_status_id; + + @Column(name = "del_status_name", nullable = false) + private String delivery_status_name; + + @Column(name = "del_status_desc", nullable = false) + private String delivery_status_description; + + @OneToMany(mappedBy = "deliveryStatus") + private List deliveries; +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Delivery_Status.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Delivery_Status.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,25 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model.statuses; - -import jakarta.persistence.*; -import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.Delivery; - -import java.util.List; - -@Entity -@Data -public class Delivery_Status { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "del_status_id") - private Short delivery_status_id; - - @Column(name = "del_status_name", nullable = false) - private String delivery_status_name; - - @Column(name = "del_status_desc", nullable = false) - private String delivery_status_description; - - @OneToMany(mappedBy = "deliveryStatus") - private List deliveries; -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/OrderStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/OrderStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/OrderStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,25 @@ +package mk.ukim.finki.db.distributorapp.model.statuses; + +import jakarta.persistence.*; +import lombok.Data; +import mk.ukim.finki.db.distributorapp.model.Orders; + +import java.util.List; + +@Entity +@Data +public class OrderStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ord_status_id") + private Short order_status_id; + + @Column(name = "ord_status_name", nullable = false) + private String order_status_name; + + @Column(name = "ord_status_desc", nullable = false) + private String order_status_description; + + @OneToMany(mappedBy = "orderStatus") + private List orders; +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Order_Status.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Order_Status.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,25 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model.statuses; - -import jakarta.persistence.*; -import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.Orders; - -import java.util.List; - -@Entity -@Data -public class Order_Status { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ord_status_id") - private Short order_status_id; - - @Column(name = "ord_status_name", nullable = false) - private String order_status_name; - - @Column(name = "ord_status_desc", nullable = false) - private String order_status_description; - - @OneToMany(mappedBy = "orderStatus") - private List orders; -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/ProFormaStatus.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/ProFormaStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/ProFormaStatus.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,25 @@ +package mk.ukim.finki.db.distributorapp.model.statuses; + +import jakarta.persistence.*; +import lombok.Data; +import mk.ukim.finki.db.distributorapp.model.ProForma; + +import java.util.List; + +@Entity +@Data +public class ProFormaStatus { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "pf_status_id") + private Short pro_forma_status_id; + + @Column(name = "pf_status_name", nullable = false) + private String pro_forma_status_name; + + @Column(name = "pf_status_desc", nullable = false) + private String pro_forma_status_description; + + @OneToMany(mappedBy = "proFormaStatus") + private List pro_formas; +} Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Pro_Forma_Status.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/statuses/Pro_Forma_Status.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,25 +1,0 @@ -package mk.ukim.finki.db.distributorapp.model.statuses; - -import jakarta.persistence.*; -import lombok.Data; -import mk.ukim.finki.db.distributorapp.model.ProForma; - -import java.util.List; - -@Entity -@Data -public class Pro_Forma_Status { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "pf_status_id") - private Short pro_forma_status_id; - - @Column(name = "pf_status_name", nullable = false) - private String pro_forma_status_name; - - @Column(name = "pf_status_desc", nullable = false) - private String pro_forma_status_description; - - @OneToMany(mappedBy = "proFormaStatus") - private List pro_formas; -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryStatusRepository.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -12,10 +12,10 @@ import java.util.Optional; -public interface DeliveryStatusRepository extends JpaRepository { +public interface DeliveryStatusRepository extends JpaRepository { @Query( nativeQuery = true, value = "" ) - List listAll(); + List listAll(); @Query( @@ -23,5 +23,5 @@ value = "" ) - List findAllByName(@NonNull @Param("name") String name); + List findAllByName(@NonNull @Param("name") String name); @Query( @@ -29,5 +29,5 @@ value = "" ) - Optional findById(@NonNull @Param("id") Short id); + Optional findById(@NonNull @Param("id") Short id); @Modifying @@ -37,5 +37,5 @@ value = "" ) - Optional create(String name, String description); + Optional create(String name, String description); @Modifying @@ -45,5 +45,5 @@ value = "" ) - Optional edit(Short id, String name, String description); + Optional edit(Short id, String name, String description); @Modifying Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrderStatusRepository.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -12,10 +12,10 @@ import java.util.Optional; -public interface OrderStatusRepository extends JpaRepository { +public interface OrderStatusRepository extends JpaRepository { @Query( nativeQuery = true, value = "" ) - List listAll(); + List listAll(); @Query( @@ -23,5 +23,5 @@ value = "" ) - List findAllByName(@NonNull @Param("name") String name); + List findAllByName(@NonNull @Param("name") String name); @Query( @@ -29,5 +29,5 @@ value = "" ) - Optional findById(@NonNull @Param("id") Short id); + Optional findById(@NonNull @Param("id") Short id); @Modifying @@ -37,5 +37,5 @@ value = "" ) - Optional create(String name, String description); + Optional create(String name, String description); @Modifying @@ -45,5 +45,5 @@ value = "" ) - Optional edit(Short id, String name, String description); + Optional edit(Short id, String name, String description); @Modifying Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/ProFormaStatusRepository.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -12,10 +12,10 @@ import java.util.Optional; -public interface ProFormaStatusRepository extends JpaRepository { +public interface ProFormaStatusRepository extends JpaRepository { @Query( nativeQuery = true, value = "" ) - List listAll(); + List listAll(); @Query( @@ -23,5 +23,5 @@ value = "" ) - List findAllByName(@NonNull @Param("name") String name); + List findAllByName(@NonNull @Param("name") String name); @Query( @@ -29,5 +29,5 @@ value = "" ) - Optional findById(@NonNull @Param("id") Short id); + Optional findById(@NonNull @Param("id") Short id); @Modifying @@ -37,5 +37,5 @@ value = "" ) - Optional create(String name, String description); + Optional create(String name, String description); @Modifying @@ -45,5 +45,5 @@ value = "" ) - Optional edit(Short id, String name, String description); + Optional edit(Short id, String name, String description); @Modifying Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -4,5 +4,5 @@ import mk.ukim.finki.db.distributorapp.model.Driver; import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import java.time.LocalDate; @@ -27,5 +27,5 @@ LocalTime del_start_time, LocalTime del_end_time, - Delivery_Status del_status, + DeliveryStatus del_status, Vehicle vehicle ); @@ -39,5 +39,5 @@ LocalTime del_start_time, LocalTime del_end_time, - Delivery_Status del_status, + DeliveryStatus del_status, Vehicle vehicle ); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryStatusService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import java.util.List; @@ -7,13 +7,13 @@ public interface DeliveryStatusService { - List listDeliveryStatus(); + List listDeliveryStatus(); - Optional getDeliveryStatusById(Short id); + Optional getDeliveryStatusById(Short id); - Optional createDeliveryStatus(String name, String description); + Optional createDeliveryStatus(String name, String description); - Optional updateDeliveryStatus(Short id, String name, String description); + Optional updateDeliveryStatus(Short id, String name, String description); - List getDeliveryStatusByName(String name); + List getDeliveryStatusByName(String name); void delete(Short id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrderStatusService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import java.util.List; @@ -7,13 +7,13 @@ public interface OrderStatusService { - List listOrderStatus(); + List listOrderStatus(); - Optional getOrderStatusById(Short id); + Optional getOrderStatusById(Short id); - Optional createOrderStatus(String name, String description); + Optional createOrderStatus(String name, String description); - Optional updateOrderStatus(Short id, String name, String description); + Optional updateOrderStatus(Short id, String name, String description); - List getOrderStatusByName(String name); + List getOrderStatusByName(String name); void delete(Short id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -5,5 +5,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import java.time.LocalDate; @@ -24,5 +24,5 @@ LocalDateTime ord_fulfillment_date, String ord_comment, - Order_Status ord_status, + OrderStatus ord_status, Customer customer, Delivery delivery, @@ -36,5 +36,5 @@ LocalDateTime ord_fulfillment_date, String ord_comment, - Order_Status ord_status, + OrderStatus ord_status, Customer customer, Delivery delivery, Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -3,5 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import java.time.LocalDate; @@ -14,7 +14,7 @@ Optional findProFormaById(Long id); - Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); + Optional create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order); - Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order); + Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order); void delete(Long id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/ProFormaStatusService.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import java.util.List; @@ -7,13 +7,13 @@ public interface ProFormaStatusService { - List listProFormaStatus(); + List listProFormaStatus(); - Optional getProFormaStatusById(Short id); + Optional getProFormaStatusById(Short id); - Optional createProFormaStatus(String name, String description); + Optional createProFormaStatus(String name, String description); - Optional updateProFormaStatus(Short id, String name, String description); + Optional updateProFormaStatus(Short id, String name, String description); - List getProFormaStatusByName(String name); + List getProFormaStatusByName(String name); void delete(Short id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -4,5 +4,5 @@ import mk.ukim.finki.db.distributorapp.model.Driver; import mk.ukim.finki.db.distributorapp.model.Vehicle; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import mk.ukim.finki.db.distributorapp.repository.DeliveryRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryService; @@ -43,5 +43,5 @@ @Override - public Optional create(LocalDate del_date_created, LocalDate del_date, Integer del_start_km, Integer del_end_km, LocalTime del_start_time, LocalTime del_end_time, Delivery_Status del_status, Vehicle vehicle) { + public Optional create(LocalDate del_date_created, LocalDate del_date, Integer del_start_km, Integer del_end_km, LocalTime del_start_time, LocalTime del_end_time, DeliveryStatus del_status, Vehicle vehicle) { return this.deliveryRepository.create( del_date_created, @@ -57,5 +57,5 @@ @Override - public Optional edit(Long del_id, LocalDate del_date_created, LocalDate del_date, Integer del_start_km, Integer del_end_km, LocalTime del_start_time, LocalTime del_end_time, Delivery_Status del_status, Vehicle vehicle) { + public Optional edit(Long del_id, LocalDate del_date_created, LocalDate del_date, Integer del_start_km, Integer del_end_km, LocalTime del_start_time, LocalTime del_end_time, DeliveryStatus del_status, Vehicle vehicle) { return this.deliveryRepository.edit( del_id, Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryStatusServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.statuses.Delivery_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.DeliveryStatus; import mk.ukim.finki.db.distributorapp.repository.DeliveryStatusRepository; import mk.ukim.finki.db.distributorapp.service.DeliveryStatusService; @@ -18,25 +18,25 @@ @Override - public List listDeliveryStatus() { + public List listDeliveryStatus() { return this.deliveryStatusRepository.findAll(); } @Override - public Optional getDeliveryStatusById(Short id) { + public Optional getDeliveryStatusById(Short id) { return this.deliveryStatusRepository.findById(id); } @Override - public Optional createDeliveryStatus(String name, String description) { + public Optional createDeliveryStatus(String name, String description) { return this.deliveryStatusRepository.create(name, description); } @Override - public Optional updateDeliveryStatus(Short id, String name, String description) { + public Optional updateDeliveryStatus(Short id, String name, String description) { return this.deliveryStatusRepository.edit(id, name, description); } @Override - public List getDeliveryStatusByName(String name) { + public List getDeliveryStatusByName(String name) { return this.deliveryStatusRepository.findAllByName(name); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrderStatusServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import mk.ukim.finki.db.distributorapp.repository.OrderStatusRepository; import mk.ukim.finki.db.distributorapp.service.OrderStatusService; @@ -19,25 +19,25 @@ @Override - public List listOrderStatus() { + public List listOrderStatus() { return this.orderStatusRepository.findAll(); } @Override - public Optional getOrderStatusById(Short id) { + public Optional getOrderStatusById(Short id) { return this.orderStatusRepository.findById(id); } @Override - public Optional createOrderStatus(String name, String description) { + public Optional createOrderStatus(String name, String description) { return this.orderStatusRepository.create(name, description); } @Override - public Optional updateOrderStatus(Short id, String name, String description) { + public Optional updateOrderStatus(Short id, String name, String description) { return this.orderStatusRepository.edit(id, name, description); } @Override - public List getOrderStatusByName(String name) { + public List getOrderStatusByName(String name) { return this.orderStatusRepository.findAllByName(name); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -5,5 +5,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.statuses.Order_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.OrderStatus; import mk.ukim.finki.db.distributorapp.repository.OrdersRepository; import mk.ukim.finki.db.distributorapp.service.OrdersService; @@ -39,5 +39,5 @@ @Override - public Optional create(LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, ProForma proForma) { + public Optional create(LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, OrderStatus ord_status, Customer customer, Delivery delivery, ProForma proForma) { return this.ordersRepository.create( ord_date, @@ -53,5 +53,5 @@ @Override - public Optional edit(Long id, LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, Order_Status ord_status, Customer customer, Delivery delivery, ProForma proForma) { + public Optional edit(Long id, LocalDate ord_date, Integer ord_sum, LocalDateTime ord_fulfillment_date, String ord_comment, OrderStatus ord_status, Customer customer, Delivery delivery, ProForma proForma) { return this.ordersRepository.edit( id, Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -3,5 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.Orders; import mk.ukim.finki.db.distributorapp.model.ProForma; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import mk.ukim.finki.db.distributorapp.repository.ProFormaRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaService; @@ -31,5 +31,5 @@ @Override - public Optional create(LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { + public Optional create(LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order) { return this.proFormaRepository.create( pf_deadline, @@ -41,5 +41,5 @@ @Override - public Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, Pro_Forma_Status pf_status, Orders order) { + public Optional edit(Long id, LocalDate pf_deadline, LocalDate pf_create_date, ProFormaStatus pf_status, Orders order) { return this.proFormaRepository.edit( id, Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/ProFormaStatusServiceImpl.java (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -1,5 +1,5 @@ package mk.ukim.finki.db.distributorapp.service.impl; -import mk.ukim.finki.db.distributorapp.model.statuses.Pro_Forma_Status; +import mk.ukim.finki.db.distributorapp.model.statuses.ProFormaStatus; import mk.ukim.finki.db.distributorapp.repository.ProFormaStatusRepository; import mk.ukim.finki.db.distributorapp.service.ProFormaStatusService; @@ -18,25 +18,25 @@ @Override - public List listProFormaStatus() { + public List listProFormaStatus() { return this.proFormaStatusRepository.findAll(); } @Override - public Optional getProFormaStatusById(Short id) { + public Optional getProFormaStatusById(Short id) { return this.proFormaStatusRepository.findById(id); } @Override - public Optional createProFormaStatus(String name, String description) { + public Optional createProFormaStatus(String name, String description) { return this.proFormaStatusRepository.create(name, description); } @Override - public Optional updateProFormaStatus(Short id, String name, String description) { + public Optional updateProFormaStatus(Short id, String name, String description) { return this.proFormaStatusRepository.edit(id, name, description); } @Override - public List getProFormaStatusByName(String name) { + public List getProFormaStatusByName(String name) { return this.proFormaStatusRepository.findAllByName(name); } Index: ontend/src/app/auth.service.spec.ts =================================================================== --- frontend/src/app/auth.service.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,16 +1,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthService } from './auth.service'; - -describe('AuthService', () => { - let service: AuthService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AuthService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); Index: ontend/src/app/auth.service.ts =================================================================== --- frontend/src/app/auth.service.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,9 +1,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class AuthService { - - constructor() { } -} Index: frontend/src/app/components/home/home.component.html =================================================================== --- frontend/src/app/components/home/home.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/home/home.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,1 @@ +

home works!

Index: frontend/src/app/components/home/home.component.spec.ts =================================================================== --- frontend/src/app/components/home/home.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/home/home.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [HomeComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: frontend/src/app/components/home/home.component.ts =================================================================== --- frontend/src/app/components/home/home.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/home/home.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-home', + imports: [], + templateUrl: './home.component.html', + styleUrl: './home.component.css' +}) +export class HomeComponent { + +} Index: frontend/src/app/components/login/login.component.html =================================================================== --- frontend/src/app/components/login/login.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/login/login.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,1 @@ +

login works!

Index: frontend/src/app/components/login/login.component.spec.ts =================================================================== --- frontend/src/app/components/login/login.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/login/login.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginComponent } from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [LoginComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: frontend/src/app/components/login/login.component.ts =================================================================== --- frontend/src/app/components/login/login.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/login/login.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-login', + imports: [], + templateUrl: './login.component.html', + styleUrl: './login.component.css' +}) +export class LoginComponent { + +} Index: frontend/src/app/components/navbar/navbar.component.html =================================================================== --- frontend/src/app/components/navbar/navbar.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/navbar/navbar.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,1 @@ +

navbar works!

Index: frontend/src/app/components/navbar/navbar.component.spec.ts =================================================================== --- frontend/src/app/components/navbar/navbar.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/navbar/navbar.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavbarComponent } from './navbar.component'; + +describe('NavbarComponent', () => { + let component: NavbarComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [NavbarComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(NavbarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: frontend/src/app/components/navbar/navbar.component.ts =================================================================== --- frontend/src/app/components/navbar/navbar.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/navbar/navbar.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-navbar', + imports: [], + templateUrl: './navbar.component.html', + styleUrl: './navbar.component.css' +}) +export class NavbarComponent { + +} Index: frontend/src/app/components/register/register.component.html =================================================================== --- frontend/src/app/components/register/register.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/register/register.component.html (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,1 @@ +

register works!

Index: frontend/src/app/components/register/register.component.spec.ts =================================================================== --- frontend/src/app/components/register/register.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/register/register.component.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RegisterComponent } from './register.component'; + +describe('RegisterComponent', () => { + let component: RegisterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [RegisterComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(RegisterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: frontend/src/app/components/register/register.component.ts =================================================================== --- frontend/src/app/components/register/register.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/components/register/register.component.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-register', + imports: [], + templateUrl: './register.component.html', + styleUrl: './register.component.css' +}) +export class RegisterComponent { + +} Index: ontend/src/app/customer.service.spec.ts =================================================================== --- frontend/src/app/customer.service.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,16 +1,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CustomerService } from './customer.service'; - -describe('CustomerService', () => { - let service: CustomerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CustomerService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); Index: ontend/src/app/customer.service.ts =================================================================== --- frontend/src/app/customer.service.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,9 +1,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class CustomerService { - - constructor() { } -} Index: ontend/src/app/home/home.component.html =================================================================== --- frontend/src/app/home/home.component.html (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,1 +1,0 @@ -

home works!

Index: ontend/src/app/home/home.component.spec.ts =================================================================== --- frontend/src/app/home/home.component.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,23 +1,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HomeComponent } from './home.component'; - -describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [HomeComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); Index: ontend/src/app/home/home.component.ts =================================================================== --- frontend/src/app/home/home.component.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,11 +1,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-home', - imports: [], - templateUrl: './home.component.html', - styleUrl: './home.component.css' -}) -export class HomeComponent { - -} Index: ontend/src/app/login/login.component.html =================================================================== --- frontend/src/app/login/login.component.html (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,1 +1,0 @@ -

login works!

Index: ontend/src/app/login/login.component.spec.ts =================================================================== --- frontend/src/app/login/login.component.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,23 +1,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LoginComponent } from './login.component'; - -describe('LoginComponent', () => { - let component: LoginComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [LoginComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(LoginComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); Index: ontend/src/app/login/login.component.ts =================================================================== --- frontend/src/app/login/login.component.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,11 +1,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-login', - imports: [], - templateUrl: './login.component.html', - styleUrl: './login.component.css' -}) -export class LoginComponent { - -} Index: frontend/src/app/models/article.model.ts =================================================================== --- frontend/src/app/models/article.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/article.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,14 @@ +import { ArticleUnitModel } from './articleUnit.model'; +import { CategoryModel } from './category.model'; +import { ManufacturerModel } from './manufacturer.model'; +import { PriceModel } from './price.model'; + +export interface ArticleModel { + articleId: number; + articleName: string; + articleWeight: number; + category?: CategoryModel; + manufacturer?: ManufacturerModel; + prices?: PriceModel[]; + articleUnits?: ArticleUnitModel[]; +} Index: frontend/src/app/models/articleUnit.model.ts =================================================================== --- frontend/src/app/models/articleUnit.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/articleUnit.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,15 @@ +import { ArticleModel } from './article.model'; +import { OrderModel } from './order.model'; +import { WarehouseModel } from './warehouse.model'; + +export interface ArticleUnitModel { + unitId: number; + unitExpirationDate: string; + unitSerialNumber: string; + unitBatchModel: string; + unitManufactureDate: string; + unitCostPrice: number; + article?: ArticleModel; + warehouse?: WarehouseModel; + order?: OrderModel; +} Index: frontend/src/app/models/category.model.ts =================================================================== --- frontend/src/app/models/category.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/category.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,7 @@ +import { ArticleModel } from './article.model'; + +export interface CategoryModel { + categoryId: number; + categoryName: string; + articles?: ArticleModel[]; +} Index: frontend/src/app/models/city.model.ts =================================================================== --- frontend/src/app/models/city.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/city.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,9 @@ +import { UserModel } from './user.model'; +import { WarehouseModel } from './warehouse.model'; + +export interface CityModel { + cityId: number; + cityName: string; + users?: UserModel[]; + warehouses?: WarehouseModel[]; +} Index: frontend/src/app/models/customer.model.ts =================================================================== --- frontend/src/app/models/customer.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/customer.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,12 @@ +import { OrderModel } from './order.model'; +import { UserModel } from './user.model'; + +export interface CustomerModel extends UserModel { + edb: string; + companyName: string; + address: string; + openTime: string; + closeTime: string; + representativeImage: string; + orders?: OrderModel[]; +} Index: frontend/src/app/models/delivery.model.ts =================================================================== --- frontend/src/app/models/delivery.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/delivery.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,16 @@ +import { DeliveryStatusModel } from './deliveryStatus.model'; +import { OrderModel } from './order.model'; +import { VehicleModel } from './vehicle.model'; + +export interface DeliveryModel { + deliveryId: number; + deliveryDateCreated: string; + deliveryDate: string; + deliveryStartKm: number; + deliveryEndKm: number; + deliveryStartTime: number; + deliveryEndTime: number; + deliveryStatus?: DeliveryStatusModel; + vehicle?: VehicleModel; + orders?: OrderModel[]; +} Index: frontend/src/app/models/deliveryStatus.model.ts =================================================================== --- frontend/src/app/models/deliveryStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/deliveryStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,8 @@ +import { DeliveryModel } from './delivery.model'; + +export interface DeliveryStatusModel { + deliveryStatusId: number; + deliveryStatusName: string; + deliveryStatusDescription: string; + deliveries?: DeliveryModel[]; +} Index: frontend/src/app/models/driver.model.ts =================================================================== --- frontend/src/app/models/driver.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/driver.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,3 @@ +import { UserModel } from './user.model'; + +export interface DriverModel extends UserModel {} Index: frontend/src/app/models/manager.model.ts =================================================================== --- frontend/src/app/models/manager.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/manager.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,3 @@ +import { UserModel } from './user.model'; + +export interface ManagerModel extends UserModel {} Index: frontend/src/app/models/manufacturer.model.ts =================================================================== --- frontend/src/app/models/manufacturer.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/manufacturer.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,10 @@ +import { ArticleModel } from './article.model'; + +export interface ManufacturerModel { + manufacturerId: number; + manufacturerName: string; + manufacturerAddress: string; + manufacturerMobile: string; + manufacturerEmail: string; + articles?: ArticleModel[]; +} Index: frontend/src/app/models/order.model.ts =================================================================== --- frontend/src/app/models/order.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/order.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,18 @@ +import { ArticleUnitModel } from './articleUnit.model'; +import { CustomerModel } from './customer.model'; +import { DeliveryModel } from './delivery.model'; +import { OrderStatusModel } from './orderStatus.model'; +import { ProFormaModel } from './proForma.model'; + +export interface OrderModel { + orderId: number; + orderDate: string; + orderSum: number; + orderFulfillmentDate: string; + orderComment: string; + orderStatus?: OrderStatusModel; + customer?: CustomerModel; + delivery?: DeliveryModel; + proForma?: ProFormaModel; + articleUnits?: ArticleUnitModel[]; +} Index: frontend/src/app/models/orderStatus.model.ts =================================================================== --- frontend/src/app/models/orderStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/orderStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,8 @@ +import { OrderModel } from './order.model'; + +export interface OrderStatusModel { + orderStatusId: number; + orderStatusName: string; + orderStatusDescription: string; + orders?: OrderModel[]; +} Index: frontend/src/app/models/price.model.ts =================================================================== --- frontend/src/app/models/price.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/price.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,8 @@ +import { ArticleModel } from './article.model'; + +export interface PriceModel { + priceId: number; + price: number; + priceEffectiveDate: string; + article?: ArticleModel; +} Index: frontend/src/app/models/proForma.model.ts =================================================================== --- frontend/src/app/models/proForma.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/proForma.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,10 @@ +import { OrderModel } from './order.model'; +import { ProFormaStatusModel } from './proFormaStatus.model'; + +export interface ProFormaModel { + proFormaId: number; + proFormaDeadline: string; + proFormaDateCreated: string; + proFormaStatus?: ProFormaStatusModel; + order?: OrderModel; +} Index: frontend/src/app/models/proFormaStatus.model.ts =================================================================== --- frontend/src/app/models/proFormaStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/proFormaStatus.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,8 @@ +import { ProFormaModel } from './proForma.model'; + +export interface ProFormaStatusModel { + proFormaStatusId: number; + proFormaStatusName: string; + proFormaStatusDescription: string; + proFormas?: ProFormaModel[]; +} Index: frontend/src/app/models/user.model.ts =================================================================== --- frontend/src/app/models/user.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/user.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,11 @@ +import { CityModel } from './city.model'; + +export interface UserModel { + userId: number; + userName: string; + userSurname: string; + userEmail: string; + userMobile: string; + userImage: string; + userCity?: CityModel; +} Index: frontend/src/app/models/vehicle.model.ts =================================================================== --- frontend/src/app/models/vehicle.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/vehicle.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,19 @@ +import { DeliveryModel } from './delivery.model'; +import { DriverModel } from './driver.model'; +import { WarehouseModel } from './warehouse.model'; + +export interface VehicleModel { + vehicleId: number; + vehicleCarryWeight: number; + vehicleServiceInterval: number; + vehicleKilometers: number; + vehicleLastService: string; + vehicleLastServiceKm: number; + vehiclePlate: string; + vehicleVin: string; + vehicleRegDate: string; + + warehouse?: WarehouseModel; + driver?: DriverModel; + deliveries?: DeliveryModel[]; +} Index: frontend/src/app/models/warehouse.model.ts =================================================================== --- frontend/src/app/models/warehouse.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/warehouse.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,13 @@ +import { ArticleUnitModel } from './articleUnit.model'; +import { CityModel } from './city.model'; +import { ManagerModel } from './manager.model'; +import { VehicleModel } from './vehicle.model'; + +export interface WarehouseModel { + warehouseId: number; + warehosueAddress: string; + city?: CityModel; + manager?: ManagerModel; + vehicles?: VehicleModel[]; + articleUnits?: ArticleUnitModel; +} Index: frontend/src/app/models/weekday.model.ts =================================================================== --- frontend/src/app/models/weekday.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/models/weekday.model.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,4 @@ +export interface WeekDayModel { + weekdayId: number; + weekdayName: string; +} Index: ontend/src/app/navbar/navbar.component.html =================================================================== --- frontend/src/app/navbar/navbar.component.html (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,1 +1,0 @@ -

navbar works!

Index: ontend/src/app/navbar/navbar.component.spec.ts =================================================================== --- frontend/src/app/navbar/navbar.component.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,23 +1,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NavbarComponent } from './navbar.component'; - -describe('NavbarComponent', () => { - let component: NavbarComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [NavbarComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(NavbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); Index: ontend/src/app/navbar/navbar.component.ts =================================================================== --- frontend/src/app/navbar/navbar.component.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,11 +1,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-navbar', - imports: [], - templateUrl: './navbar.component.html', - styleUrl: './navbar.component.css' -}) -export class NavbarComponent { - -} Index: ontend/src/app/register/register.component.html =================================================================== --- frontend/src/app/register/register.component.html (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,1 +1,0 @@ -

register works!

Index: ontend/src/app/register/register.component.spec.ts =================================================================== --- frontend/src/app/register/register.component.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,23 +1,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { RegisterComponent } from './register.component'; - -describe('RegisterComponent', () => { - let component: RegisterComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [RegisterComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(RegisterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); Index: ontend/src/app/register/register.component.ts =================================================================== --- frontend/src/app/register/register.component.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,11 +1,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-register', - imports: [], - templateUrl: './register.component.html', - styleUrl: './register.component.css' -}) -export class RegisterComponent { - -} Index: frontend/src/app/services/auth.service.spec.ts =================================================================== --- frontend/src/app/services/auth.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/auth.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { AuthService } from './auth.service'; + +describe('AuthService', () => { + let service: AuthService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(AuthService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); Index: frontend/src/app/services/auth.service.ts =================================================================== --- frontend/src/app/services/auth.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/auth.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class AuthService { + + constructor() { } +} Index: frontend/src/app/services/customer.service.spec.ts =================================================================== --- frontend/src/app/services/customer.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/customer.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { CustomerService } from './customer.service'; + +describe('CustomerService', () => { + let service: CustomerService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(CustomerService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); Index: frontend/src/app/services/customer.service.ts =================================================================== --- frontend/src/app/services/customer.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/customer.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class CustomerService { + + constructor() { } +} Index: frontend/src/app/services/user.service.spec.ts =================================================================== --- frontend/src/app/services/user.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/user.service.spec.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UserService } from './user.service'; + +describe('UserService', () => { + let service: UserService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(UserService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); Index: frontend/src/app/services/user.service.ts =================================================================== --- frontend/src/app/services/user.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) +++ frontend/src/app/services/user.service.ts (revision 36fa2714ac6cb9ab1eae3b317a7e0745de8d0d97) @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class UserService { + + constructor() { } +} Index: ontend/src/app/user.service.spec.ts =================================================================== --- frontend/src/app/user.service.spec.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,16 +1,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserService } from './user.service'; - -describe('UserService', () => { - let service: UserService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UserService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); Index: ontend/src/app/user.service.ts =================================================================== --- frontend/src/app/user.service.ts (revision 23f8f3d0d8280374fd3fc3be51d79e4e69bc1e05) +++ (revision ) @@ -1,9 +1,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class UserService { - - constructor() { } -}