Index: stributorApp_DB_Scheme_ver9.xml
===================================================================
--- DistributorApp_DB_Scheme_ver9.xml (revision ffc28e7f610127c90f531caae74fe9fed2ac87c4)
+++ (revision )
@@ -1,1 +1,0 @@
-truetrueuser_idUSERSunit_cost_priceARTICLE_UNITunit_expiration_dateVEHICLEDELIVERYPRO_FORMAARTICLEORDERSCITYMANAGERCUSTOMERDRIVERtrue16d33WAREHOUSEdrives33creates_order3Nmanages33located_inorder_containsin_stockdeliversgenerates3shipping3user_nameuser_surnamecity_namecust_EDBcust_adruser_emailuser_mobiletruetrueord_idtruetruewh_idtruetruecity_idtruetrueveh_idtruetruedel_idtruetrueart_idtruetruepf_idveh_carry_weightart_nameart_imageart_weightord_datepf_date_createdpf_deadlinedel_dateCATEGORYtruetruectg_idctg_namefrom_category3Mcust_company_namewarehouse_locationwh_adrcust_representative_img3Mbelongs_to3N3P3Nunit_pricePRICE3Ndel_date_createdDELIVERY3Munit_manufacture_dateunit_batch_nounit_serial_notruetrueunit_idveh_service_intervalveh_kilometersVEHICLEord_sumord_fulfillment_dateMord_commentPRO_FORMA_STATUSpf_status3Nd_statusDELIVERY_STATUSORDER_STATUS3No_status3Nuser_imagetruetrueo_status_ido_status_nametruetruepf_status_idpf_status_nametruetrued_status_idd_status_named_status_desco_status_descpf_status_descveh_last_serviceveh_last_service_kmveh_vinveh_platedel_end_kmdel_start_kmdel_start_timedel_end_timeuser_passuser_saltMANUFACTURERmanufac_by3Ntruetrueman_idman_nameman_adrman_mobileman_emailart_priceuser_activeveh_reg_date3Ntruetrueprice_idprice_eff_datepriceTOKEN_WEEKDAYver_tokenwork_daysM3Ptruetrueday_idday_nametruetruet_idt_valuet_dateREGIONreg_cities3M3truetrueregion_idregion_name3start_timeend_timeuser_role3Mt_expiryt_validated_att_typeclazz_cust_loc_latitudecust_loc_longitudeIMAGE_STOREimg_ent_typeimg_ent_idimg_pathtruetrueimg_id
Index: eiranje_app.sql
===================================================================
--- kreiranje_app.sql (revision ffc28e7f610127c90f531caae74fe9fed2ac87c4)
+++ (revision )
@@ -1,287 +1,0 @@
-set search_path = "IND0_185022";
-
-drop table if exists token_;
-drop table if exists customer_weekday;
-drop table if exists unit_price;
-drop table if exists article_unit;
-drop table if exists orders;
-drop table if exists delivery;
-drop table if exists pro_forma;
-drop table if exists price;
-drop table if exists article;
-drop table if exists manufacturer;
-drop table if exists driver;
-drop table if exists manager;
-drop table if exists customer;
-drop table if exists users;
-drop table if exists vehicle;
-drop table if exists warehouse;
-drop table if exists city;
-drop table if exists region;
-drop table if exists category;
-drop table if exists weekday;
-drop table if exists pro_forma_status;
-drop table if exists delivery_status;
-drop table if exists order_status;
-
-drop schema if exists "IND0_185022";
-
-create schema "IND0_185022";
-
-set search_path = "IND0_185022";
-
--- ENTITIES:
-
-create table order_status
-(
- o_status_id smallint generated by default as identity primary key,
- o_status_name varchar(255) not null unique,
- o_status_desc text not null
-);
-
-create table delivery_status
-(
- d_status_id smallint generated by default as identity primary key,
- d_status_name varchar(255) not null unique,
- d_status_desc text not null
-);
-
-create table pro_forma_status
-(
- pf_status_id smallint generated by default as identity primary key,
- pf_status_name varchar(255) not null unique,
- pf_status_desc text not null
-);
-
-create table weekday
-(
- day_id smallint generated by default as identity primary key,
- day_name varchar(20) not null
-);
-
-create table category
-(
- ctg_id int generated by default as identity primary key,
- ctg_name varchar(255) not null
-);
-
-create table region
-(
- region_id int generated by default as identity primary key,
- region_name varchar(255) not null
-);
-
-create table city
-(
- city_id int generated by default as identity primary key,
- city_name varchar(255) not null,
- region_id int not null,
- foreign key (region_id) references region (region_id)
-);
-
-create table warehouse
-(
- wh_id int generated by default as identity primary key,
- wh_adr varchar(255) not null,
- city_id int not null,
- foreign key (city_id) references city (city_id)
-);
-
-create table vehicle
-(
- veh_id int generated by default as identity primary key,
- veh_carry_weight int not null,
- veh_service_interval smallint not null,
- veh_last_service_km int not null,
- veh_last_service date not null,
- veh_kilometers int not null,
- veh_plate varchar(8) not null,
- veh_vin varchar(17) not null unique,
- veh_reg_date date not null,
- wh_id int not null,
- foreign key (wh_id) references warehouse (wh_id)
-);
-
-create table users
-(
- user_id bigint generated by default as identity primary key,
- user_name varchar(255) not null,
- user_surname varchar(255) not null,
- user_pass varchar(255) not null,
- user_salt varchar(255) not null,
- user_email varchar(255) not null,
- user_mobile varchar(255) not null,
- user_active boolean not null,
- user_image varchar(255),
- clazz_ varchar(255) not null,
- user_role varchar(255) not null,
- city_id int not null,
- foreign key (city_id) references city (city_id),
- unique(user_email)
-);
-
-create table customer
-(
- user_id bigint primary key,
- cust_EDB varchar(13) not null,
- cust_company_name varchar(255) not null,
- cust_adr varchar(255) not null,
- cust_representative_img varchar(255),
- foreign key (user_id) references users (user_id),
- unique(cust_EDB)
-);
-
-create table manager
-(
- user_id bigint primary key,
- wh_id int not null,
- foreign key (wh_id) references warehouse (wh_id),
- foreign key (user_id) references users (user_id)
-);
-
-create table driver
-(
- user_id bigint primary key,
- veh_id int not null,
- foreign key (veh_id) references vehicle (veh_id),
- foreign key (user_id) references users (user_id)
-);
-
-create table manufacturer
-(
- man_id bigint generated by default as identity primary key,
- man_name varchar(255) not null,
- man_adr varchar(255) not null,
- man_mobile varchar(255) not null,
- man_email varchar(255) not null
-);
-
-create table article
-(
- art_id bigint generated by default as identity primary key,
- art_name varchar(255) not null,
- art_image varchar(255) not null,
- art_weight int not null,
- ctg_id int not null,
- man_id bigint not null,
- foreign key (ctg_id) references category (ctg_id),
- foreign key (man_id) references manufacturer (man_id)
-);
-
-create table price
-(
- price_id int generated by default as identity primary key,
- price decimal not null,
- price_eff_date timestamp not null default current_timestamp,
- art_id bigint not null,
- foreign key (art_id) references article (art_id)
-);
-
-create table pro_forma
-(
- pf_id bigint generated by default as identity primary key,
- pf_deadline date not null,
- pf_date_created date not null,
- pf_status_id smallint not null,
- foreign key (pf_status_id) references pro_forma_status (pf_status_id)
-);
-
-create table delivery
-(
- del_id bigint generated by default as identity primary key,
- del_date_created date not null,
- del_date date not null,
- del_start_km int,
- del_end_km int,
- del_start_time time,
- del_end_time time,
- d_status_id smallint not null,
- veh_id int not null,
- foreign key (d_status_id) references delivery_status (d_status_id),
- foreign key (veh_id) references vehicle (veh_id)
-);
-
-create table orders
-(
- ord_id bigint generated by default as identity primary key,
- ord_date date not null,
- ord_sum decimal (10,2) not null,
- ord_fulfillment_date timestamp,
- ord_comment text,
- o_status_id smallint not null,
- cust_id bigint not null,
- del_id bigint,
- pf_id bigint,
- foreign key (o_status_id) references order_status (o_status_id),
- foreign key (cust_id) references customer (user_id),
- foreign key (del_id) references delivery (del_id),
- foreign key (pf_id) references pro_forma (pf_id)
-);
-
-create table article_unit
-(
- unit_id bigint generated by default as identity primary key,
- unit_expiration_date date not null,
- unit_serial_number varchar(255) not null,
- unit_batch_number varchar(255) not null,
- unit_manufacture_date date not null,
- wh_id int not null,
- ord_id bigint,
- foreign key (wh_id) references warehouse (wh_id),
- foreign key (ord_id) references orders (ord_id)
-);
-
-create table unit_price
-(
- unit_id bigint not null,
- price_id bigint not null,
- primary key (unit_id, price_id),
- foreign key (unit_id) references article_unit (unit_id),
- foreign key (price_id) references price (price_id)
-);
-
-create table order_item (
- item_id bigint generated by default as identity primary key,
- ord_id bigint not null,
- art_id bigint not null,
- quantity int not null,
- unit_price decimal(10,2) not null,
- total_price decimal(10,2) generated always as (quantity*unit_price) stored,
- foreign key (ord_id) references orders(ord_id),
- foreign key (art_id) references article (art_id),
- unique (ord_id, art_id)
-);
-
-create table customer_weekday
-(
- cust_day_id bigint generated by default as identity primary key,
- cust_id bigint not null,
- day_id smallint not null,
- start_time time not null,
- end_time time not null,
- foreign key (cust_id) references customer (user_id),
- foreign key (day_id) references weekday (day_id)
-);
-
-create table token_
-(
- t_id bigint generated by default as identity primary key,
- t_value text not null,
- t_date timestamp not null default current_timestamp,
- t_type varchar(255) not null,
- t_expiry timestamp,
- t_validated_at timestamp,
- t_user bigint not null,
- foreign key (t_user) references users (user_id)
-);
-
-create table image_store(
- img_id bigint generated by default as identity primary key,
- img_path text not null,
- img_ent_type text not null,
- img_ent_id int not null,
- img_title varchar(255),
- img_upload_date timestamp default current_timestamp,
- img_uploaded_by bigint,
- foreign key (img_uploaded_by) references users(user_id)
-);
Index: src/app/services/manager.service.ts
===================================================================
--- src/app/services/manager.service.ts (revision ffc28e7f610127c90f531caae74fe9fed2ac87c4)
+++ src/app/services/manager.service.ts (revision 9d8d850662ac9059cec2b8c91584a22d39eeaa09)
@@ -77,5 +77,5 @@
getAvailableCities(): Observable {
return this.http.get(
- `${environment.apiUrl}/cities/manager/available-cities`,
+ `${environment.apiUrl}/city/manager/available-cities`,
);
}
@@ -87,5 +87,5 @@
}
return this.http.get(
- `${environment.apiUrl}/manager/vehicles/available`,
+ `${environment.apiUrl}/vehicle/manager/available-vehicles`,
{ params },
);