Index: kreiranje.sql =================================================================== --- DB/kreiranje.sql (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,206 +1,0 @@ --- delete tables if they exist -drop table if exists project.Fakturi; -drop table if exists project.Licenci; -drop table if exists project.Rezervacii; -drop table if exists project.Roba; -drop table if exists project.Ruti; -drop table if exists project.Vozila; -drop table if exists project.Administratori; -drop table if exists project.Dispeceri; -drop table if exists project.Vozaci; -drop table if exists project.Vraboteni_telefoni; -drop table if exists project.Vraboteni; -drop table if exists project.Tipovi; -drop table if exists project.Kategorii; -drop table if exists project.Kompanii; -drop table if exists project.Gradovi; -drop table if exists project.Klienti; - --- create tables --- Kompanii: Kompanii(kompanija_id, kompanija_ime, kompanija_adresa, kompanija_telefon) -create table project.Kompanii( - kompanija_id serial not null, - kompanija_ime varchar(300) not null, - kompanija_adresa varchar(300) not null, - kompanija_telefon varchar(300) not null, - - constraint pk_Kompanii primary key (kompanija_id), - constraint un_Kompanii_kompanija_ime unique (kompanija_ime) -); - --- Vraboteni: Vraboteni(vraboten_id, vraboten_ime, vraboten_prezime, vraboten_email, vraboten_password, kompanija_id*(Kompanii)) -create table project.Vraboteni( - vraboten_id serial not null, - vraboten_ime varchar(300) not null, - vraboten_prezime varchar(300) not null, - vraboten_email varchar(300) not null, - vraboten_password varchar(300) not null, - - kompanija_id integer not null, - - constraint pk_Vraboteni primary key (vraboten_id), - constraint fk_Vraboteni_Kompanii foreign key (kompanija_id) references project.Kompanii(kompanija_id) -); - - --- Administratori: Administratori(administrator_id*(Vraboteni)) -create table project.Administratori( - administrator_id integer not null, - - constraint pk_Administratori primary key (administrator_id), - constraint fk_Administratori_Vraboteni foreign key (administrator_id) references project.Vraboteni(vraboten_id) -); - --- Dispeceri: Dispeceri(dispecer_id*(Vraboteni)) -create table project.Dispeceri( - dispecer_id integer not null, - - constraint pk_Dispeceri primary key (dispecer_id), - constraint fk_Dispeceri_Vraboteni foreign key (dispecer_id) references project.Vraboteni(vraboten_id) -); - --- Vozaci: Vozaci(vozac_id*(Vraboteni)) -create table project.Vozaci( - vozac_id integer not null, - - constraint pk_Vozaci primary key (vozac_id), - constraint fk_Vozaci_Vraboteni foreign key (vozac_id) references project.Vraboteni(vraboten_id) -); - --- Vraboteni_telefoni: Vraboteni_telefoni(vraboten_id*(Vraboteni), telefonski_broj) -create table project.Vraboteni_telefoni( - vraboten_id integer not null, - telefonski_broj varchar(100) not null, - - constraint pk_Vraboteni_telefoni primary key (vraboten_id, telefonski_broj), - constraint fk_Vraboteni_telefoni_Vraboteni foreign key (vraboten_id) references project.Vraboteni(vraboten_id) -); - --- Tipovi: Tipovi(tip_id, tip_ime) -create table project.Tipovi( - tip_id serial not null, - tip_ime varchar(300) not null, - - constraint pk_Tipovi primary key (tip_id), - constraint un_Tipovi_tip_ime unique (tip_ime) -); - --- Vozila: Vozila(vozilo_id, vozilo_kapacitet, vozilo_marka, kompanija_id*(Kompanii), tip_id*(Tipovi), vozac_id*(Vozaci)) -create table project.Vozila( - vozilo_id serial not null, - vozilo_kapacitet integer not null, - vozilo_marka varchar(300) not null, - - kompanija_id integer not null, - tip_id integer not null, - vozac_id integer not null, - - constraint pk_Vozila primary key (vozilo_id), - constraint fk_Vozila_Kompanii foreign key (kompanija_id) references project.Kompanii(kompanija_id), - constraint fk_Vozila_Tipovi foreign key (tip_id) references project.Tipovi(tip_id), - constraint fk_Vozila_Vozaci foreign key (vozac_id) references project.Vozaci(vozac_id) -); - --- Klienti: Klienti(klient_id, klient_ime, klient_prezime, klient_email, klient_telefon) -create table project.Klienti( - klient_id serial not null, - klient_ime varchar(300) not null, - klient_prezime varchar(300) not null, - klient_email varchar(300) not null, - klient_password varchar(300) not null, - klient_telefon varchar(100) not null, - - constraint pk_Klienti primary key (klient_id), - constraint un_Klienti_klient_email unique (klient_email) -); - --- Gradovi: Gradovi(grad_id, grad_ime) -create table project.Gradovi( - grad_id serial not null, - grad_ime varchar(300) not null, - - constraint pk_Gradovi primary key (grad_id), - constraint un_Gradovi_ime unique (grad_ime) -); - --- Ruti: Ruti(ruta_id, datum_poagjanje, datum_pristignuvanje,s vozilo_id*(Vozila), --- zapocnuva_vo*(Gradovi), zavrsuva_vo*(Gradovi), dispecer_id*(Dispeceri), vozac_id*(Vozaci)) -create table project.Ruti( - ruta_id serial not null, - datum_poagjanje date not null, - datum_pristignuvanje date not null, - - vozilo_id integer not null, - zapocnuva_vo integer not null, - zavrsuva_vo integer not null, - dispecer_id integer not null, - vozac_id integer not null, - - constraint pk_Ruti primary key (ruta_id), - constraint fk_Ruti_Vozila foreign key(vozilo_id) references project.Vozila(vozilo_id), - constraint fk_Ruti_Zapocnuva_Gradovi foreign key(zapocnuva_vo) references project.Gradovi(grad_id), - constraint fk_Ruti_Zavrsuva_Gradovi foreign key(zavrsuva_vo) references project.Gradovi(grad_id), - constraint fk_Ruti_Dispeceri foreign key(dispecer_id) references project.Dispeceri(dispecer_id), - constraint fk_Ruti_Vozaci foreign key(vozac_id) references project.Vozaci(vozac_id) -); - --- Kategorija: Kategorii(kategorija_id, kategorija_ime) -create table project.Kategorii( - kategorija_id serial not null, - kategorija_ime varchar(300) not null, - - constraint pk_Kategorii primary key (kategorija_id), - constraint un_Kategorija_ime unique (kategorija_ime) -); - --- Rezervacii: Rezervacii(rezervacija_id, rezervacija_status, klient_id*(Klienti), ruta_id*(Ruti)) -create table project.Rezervacii( - rezervacija_id serial not null, - rezervacija_status varchar(300) not null, - - klient_id integer not null, - ruta_id integer not null, - - constraint pk_Rezervacii primary key (rezervacija_id), - constraint fk_Rezervacii_Klienti foreign key (klient_id) references project.Klienti(klient_id), - constraint fk_Rezervacii_Ruti foreign key (ruta_id) references project.Ruti(ruta_id) -); - --- Roba: Roba(roba_id, roba_kolicina, kategorija_id*(Kategorii), rezervacija_id*(Rezervacii)) -create table project.Roba( - roba_id serial not null, - roba_kolicina integer not null, - - rezervacija_id integer not null, - kategorija_id integer not null, - - constraint pk_Roba primary key (roba_id), - constraint fk_Roba_Kategorii foreign key(kategorija_id) references project.Kategorii(kategorija_id), - constraint fk_Roba_Rezervacii foreign key (rezervacija_id) references project.Rezervacii(rezervacija_id) -); - --- Fakturi: Fakturi(faktura_id, faktura_iznos, rezervacija_id*(Rezervacii), administrator_id*(Vraboteni)) -create table project.Fakturi( - faktura_id serial not null, - faktura_iznos integer not null, - - rezervacija_id integer not null, - administrator_id integer not null, - - constraint pk_Fakturi primary key (faktura_id), - constraint fk_Fakturi_Rezervacii foreign key (rezervacija_id) references project.Rezervacii(rezervacija_id), - constraint fk_Fakturi_Administratori foreign key (administrator_id) references project.Administratori(administrator_id) -); - --- Licenci: Licenci(kompanija_id*(Kompanii), licenca_id, licenca_vazi_od, licenca_vazi_do) -create table project.Licenci( - licenca_id serial not null, - licenca_vazi_od date not null, - licenca_vazi_do date not null, - - kompanija_id integer not null, - - constraint pk_Licenci primary key (kompanija_id, licenca_id), - constraint fk_Licenci_Kompanii foreign key (kompanija_id) references project.Kompanii(kompanija_id) -); - Index: polnenje.sql =================================================================== --- DB/polnenje.sql (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,94 +1,0 @@ -insert into project.kompanii(kompanija_id, kompanija_ime, kompanija_adresa, kompanija_telefon) values - (default, 'КИШ Транс', 'ул.Гоце Делчев', '+38976543123'), - (default, 'Фулда', 'ул.Беджих Сметана', '+38976543123'), - (default, 'Мак-Возилa', 'ул.808 16', '+38976543123'), - (default, 'МакАутоСтар', 'ул. Индустриска 2', '+38976543123'), - (default, 'Ерка БМЦ', 'ул. Железничка 16', '+38976543123'); - -insert into project.vraboteni(vraboten_id, vraboten_ime, vraboten_prezime, vraboten_email, vraboten_password, kompanija_id) values - (default, 'Миле', 'Радически', 'mile.radiceski@gmail.com', 'mr', 4), - (default, 'Стефанија', 'Теофилоска', 'stefanija.tepofiloska@hotmail.com', 'st', 2), - (default, 'Андреа', 'Стојаноска', 'andrea.stojanoska@gmail.com', 'as', 3), - (default, 'Владимир', 'Стерјоски', 'vladimir.sterjoski@gmail.com', 'vs', 1), - (default, 'Кире', 'Филиповски', 'kire.filiposki@hotmail.com', 'kf', 1), - (default, 'Симон', 'Дамјаноски', 'simon.damjanoski@gmail.com', 'sd', 4), - (default, 'Игор', 'Савески', 'igor.saveski@gmail.com', 'is', 1); - -insert into project.Administratori(administrator_id) values - (1),(4); - -insert into project.dispeceri(dispecer_id) values - (2),(3),(5); - -insert into project.vozaci(vozac_id) values - (6), (7); - -insert into project.vraboteni_telefoni(vraboten_id, telefonski_broj) values - (1, '+38977978000'), - (2, '+38976935765'), - (1, '+38971722073'), - (3, '+38970240756'), - (4, '+38972929292'), - (5, '+38975455980'), - (6, '+38970250876'), - (7, '+38971345645'), - (3, '+38977121902'); - -insert into project.tipovi (tip_id, tip_ime) values - (default, 'Комбе'), - (default, 'Камион'), - (default, 'Шлепер'); - -insert into project.vozila(vozilo_id, vozilo_kapacitet, vozilo_marka, kompanija_id, tip_id, vozac_id) values - (default, 5, 'Ман', 1, 3, 7), - (default, 3, 'Мерцедес', 1, 2, 7), - (default, 5, 'Сканија', 3, 1, 6), - (default, 5, 'Ивеко', 3, 2, 6); - -insert into project.klienti (klient_id, klient_ime, klient_prezime, klient_email, klient_password, klient_telefon) values - (default, 'Стефан', 'Дојковски', 'stefan.dojkovski@gmail.com', 'sd','+38978989898'), - (default, 'Моника', 'Томоска', 'monika.tomoska@yahoo.com', 'mt','+38972098534'), - (default, 'Миха', 'Богдановиќ', 'miha.bogdanovikj@gmail.com', 'mb','+38971756123'); - -insert into project.gradovi(grad_id, grad_ime) values - (default, 'Тетово'), - (default, 'Кочани'), - (default, 'Штип'), - (default, 'Велес'), - (default, 'Скопје'), - (default, 'Битола'); - -insert into project.ruti(ruta_id, datum_poagjanje, datum_pristignuvanje, vozilo_id, zapocnuva_vo, zavrsuva_vo, dispecer_id, vozac_id) values - (default, '2021-01-08', '2021-01-08', 1, 2, 1, 5, 7), - (default, '2022-12-12', '2022-12-12', 3, 2, 2, 2, 6), - (default, '2022-12-23', '2022-12-23', 3, 2, 2, 2, 6), - (default, '2023-12-12', '2023-12-12', 3, 2, 2, 2, 6), - (default, '2022-08-05', '2022-08-05', 2, 1, 3, 5, 7); - -insert into project.kategorii(kategorija_id, kategorija_ime) values - (default, 'Пијалоци'), - (default, 'Храна'), - (default, 'Мебел'); - -insert into project.rezervacii(rezervacija_id, rezervacija_status, klient_id, ruta_id) values - (default, 'Активна', 2, 2), - (default, 'Активна', 1, 1), - (default, 'Завршена', 1, 3); - -insert into project.roba(roba_id, roba_kolicina, kategorija_id, rezervacija_id) values - (default, 2, 2, 1), - (default, 3, 1, 1), - (default, 3, 3, 2), - (default, 1, 1, 3); - -insert into project.fakturi(faktura_id, faktura_iznos, rezervacija_id, administrator_id) values - (default, 1000, 2, 4), - (default, 1000, 1, 1), - (default, 1000, 3, 4); - -insert into project.licenci(licenca_id, licenca_vazi_od, licenca_vazi_do, kompanija_id) values - (default, '2020-02-01', '2027-01-31', 1), - (default, '2016-03-20', '2023-03-19', 2), - (default, '2021-10-14', '2028-10-13', 3), - (default, '2020-08-10', '2027-08-09', 4), - (default, '2018-07-07', '2025-07-06', 5); Index: README.md =================================================================== --- README.md (revision 49b77232556b4ad9f9002d6a54a325602fa4f1d1) +++ README.md (revision 49b77232556b4ad9f9002d6a54a325602fa4f1d1) @@ -0,0 +1,1 @@ +# DataBase TRUCKIO probno Index: uckIO/.idea/.gitignore =================================================================== --- TruckIO/.idea/.gitignore (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,8 +1,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml Index: uckIO/.idea/compiler.xml =================================================================== --- TruckIO/.idea/compiler.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,22 +1,0 @@ - - - - - - - - - - - - - - - - - - - - Index: uckIO/.idea/encodings.xml =================================================================== --- TruckIO/.idea/encodings.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ - - - - - - - Index: uckIO/.idea/final.iml =================================================================== --- TruckIO/.idea/final.iml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ - - - - - - - - - Index: uckIO/.idea/jarRepositories.xml =================================================================== --- TruckIO/.idea/jarRepositories.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,20 +1,0 @@ - - - - - - - - - - - Index: uckIO/.idea/jpa-buddy.xml =================================================================== --- TruckIO/.idea/jpa-buddy.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,6 +1,0 @@ - - - - - Index: uckIO/.idea/libraries/Maven__antlr_antlr_2_7_7.xml =================================================================== --- TruckIO/.idea/libraries/Maven__antlr_antlr_2_7_7.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml =================================================================== --- TruckIO/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml =================================================================== --- TruckIO/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_4.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_4.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_4.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_4.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_4_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_4_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_4.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_4.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_4.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_4.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_4.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_4.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_h2database_h2_2_1_214.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_h2database_h2_2_1_214.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_7_0.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_7_0.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml =================================================================== --- TruckIO/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_139.xml =================================================================== --- TruckIO/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_139.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml =================================================================== --- TruckIO/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml =================================================================== --- TruckIO/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml =================================================================== --- TruckIO/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_12_18.xml =================================================================== --- TruckIO/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_12_18.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_12_18.xml =================================================================== --- TruckIO/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_12_18.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml =================================================================== --- TruckIO/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml =================================================================== --- TruckIO/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_68.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_68.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_68.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_68.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_68.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_68.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_assertj_assertj_core_3_22_0.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_assertj_assertj_core_3_22_0.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_checkerframework_checker_qual_3_5_0.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_checkerframework_checker_qual_3_5_0.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_7.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_7.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_7.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_7.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_12_Final.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_12_Final.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_mockito_mockito_core_4_5_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_mockito_mockito_core_4_5_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_5_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_5_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_postgresql_postgresql_42_3_7.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_postgresql_postgresql_42_3_7.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_7_5.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_7_5.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_aop_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_aop_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_beans_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_beans_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_context_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_context_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_core_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_core_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_expression_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_expression_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_orm_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_orm_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_test_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_test_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_tx_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_tx_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_web_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_web_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_23.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_23.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_webjars_bootstrap_4_3_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_webjars_bootstrap_4_3_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_webjars_webjars_locator_core_0_50.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_webjars_webjars_locator_core_0_50.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_9_0.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_9_0.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/libraries/Maven__org_yaml_snakeyaml_1_30.xml =================================================================== --- TruckIO/.idea/libraries/Maven__org_yaml_snakeyaml_1_30.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ - - - - - - - - - - - - - Index: uckIO/.idea/misc.xml =================================================================== --- TruckIO/.idea/misc.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ - - - - - - - - - Index: uckIO/.idea/modules.xml =================================================================== --- TruckIO/.idea/modules.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ - - - - - - - - - Index: uckIO/.idea/vcs.xml =================================================================== --- TruckIO/.idea/vcs.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,6 +1,0 @@ - - - - - - Index: uckIO/README.md =================================================================== --- TruckIO/README.md (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -# TruckIo - -Веб апликација која ги таргетира клиентите кои располагаат со големо количество на продукти за кои е потребен транспорт до одредена дестинација и компаниите кои го нудат тоа. Компаниите кои го користат системот нудат транспорт со сопствени возила и вработени. Целта е побарувачите на услугата да можат полесно да дојдат до можноста за резервација на возило и рута за транспорт, а воедно компаниите полесно да добијат нови клиенти и резервации. - -За секој ненајавен корисник ќе се прикажуваат само компаниите кои го користат системот и рутите кои ги нудат. Кога корисникот ќе се регистрира, може да наведе податоци за категоријата и количината на роба која сака да ја транспортира. Според селектираните рута и роба ќе се креира резервација за конкретната рута. По креирањето на резервацијата, администраторот креира фактура и го ажурира статусот на резервацијата. - -Компаниите располагаат со вработени кои може да имаат улога на администратор, возач или диспечер. Администраторите менаџираат рутите кои ги нуди компанијата и издаваат фактури, возачите ги возат резервираните рути, а диспечерите ги управуваат рутите. Index: uckIO/truckio/.gitignore =================================================================== --- TruckIO/truckio/.gitignore (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,33 +1,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ Index: uckIO/truckio/.mvn/wrapper/maven-wrapper.properties =================================================================== --- TruckIO/truckio/.mvn/wrapper/maven-wrapper.properties (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,2 +1,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar Index: uckIO/truckio/mvnw =================================================================== --- TruckIO/truckio/mvnw (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,316 +1,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`\\unset -f command; \\command -v java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" Index: uckIO/truckio/mvnw.cmd =================================================================== --- TruckIO/truckio/mvnw.cmd (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,188 +1,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% Index: uckIO/truckio/pom.xml =================================================================== --- TruckIO/truckio/pom.xml (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,114 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.7.5 - - - project - truckio - 0.0.1-SNAPSHOT - truckio - truckio - - 17 - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - - com.h2database - h2 - - - org.postgresql - postgresql - - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - juint-vintage-engine - - - - - - javax.persistence - javax.persistence-api - 2.2 - - - - - org.webjars - jquery - 3.4.1 - - - org.webjars - bootstrap - 4.3.1 - - - org.webjars - webjars-locator-core - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - Index: uckIO/truckio/src/main/java/project/truckio/TruckioApplication.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/TruckioApplication.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,16 +1,0 @@ -package project.truckio; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.context.annotation.Bean; - -@ServletComponentScan -@SpringBootApplication -public class TruckioApplication { - - public static void main(String[] args) { - SpringApplication.run(TruckioApplication.class, args); - } - -} Index: uckIO/truckio/src/main/java/project/truckio/model/Administrator.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Administrator.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,26 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import javax.persistence.*; - -@Entity -@Table(name = "administratori",schema = "project") -@Data -public class Administrator { - @Id - @Column(name = "administrator_id", nullable = false) - private Integer administrator_id; - - @MapsId - @OneToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "administrator_id", nullable = false) - private Vraboten vraboten; - - public Administrator(Vraboten vraboten) { - this.vraboten = vraboten; - } - - public Administrator() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Dispecer.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Dispecer.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,26 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import javax.persistence.*; - -@Entity -@Table(name = "dispeceri",schema = "project") -@Data -public class Dispecer { - @Id - @Column(name = "dispecer_id", nullable = false) - private Integer dispecer_id; - - @MapsId - @OneToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "dispecer_id", nullable = false) - private Vraboten vraboten; - - public Dispecer(Vraboten vraboten) { - this.vraboten = vraboten; - } - - public Dispecer() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Faktura.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Faktura.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,36 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import javax.persistence.*; - -@Entity -@Table(name = "fakturi",schema = "project") -@Data -public class Faktura { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "faktura_id", nullable = false) - private Integer faktura_id; - - @Column(name = "faktura_iznos", nullable = false) - private Integer faktura_iznos; - - // vrski - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "rezervacija_id") - private Rezervacija rezervacija; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "administrator_id") - private Administrator administrator; - - public Faktura(Integer faktura_iznos, Rezervacija rezervacija, Administrator administrator) { - this.faktura_iznos = faktura_iznos; - this.rezervacija = rezervacija; - this.administrator = administrator; - } - - public Faktura() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Grad.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Grad.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,25 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Table(name = "gradovi",schema = "project") -@Data -public class Grad { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "grad_id", nullable = false) - private Integer grad_id; - - @Column(name = "grad_ime", nullable = false, length = 300) - private String grad_ime; - - public Grad(String grad_ime) { - this.grad_ime = grad_ime; - } - - public Grad() {} - -} Index: uckIO/truckio/src/main/java/project/truckio/model/Izvestaj.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Izvestaj.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,49 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import org.hibernate.annotations.Immutable; - -import javax.persistence.*; -import java.math.BigInteger; - -@Data -@Entity -@Immutable -@Table(name = "izvestaj_kompanii",schema = "project") -public class Izvestaj { - @Id - @Column(name = "kompanija_id", nullable = false) - private Integer kompanija_id; - - @MapsId - @OneToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "kompanija_id", nullable = false) - private Kompanija kompanija; - - @Column(name = "kompanija_ime", nullable = false, length = 300) - private String kompanija_ime; - - @Column(name = "broj_vraboteni", nullable = false) - private Long broj_vraboteni; - - @Column(name = "vkupno_klienti", nullable = false) - private Long vkupno_klienti; - - @Column(name = "vkupna_zarabotka", nullable = false) - private Long vkupna_zarabotka; - - @Column(name = "vkupno_rezervacii", nullable = false) - private Long vkupno_rezervacii; - - @Column(name = "vkupno_aktivni_rezervacii", nullable = false) - private Long vkupno_aktivni_rezervacii; - - @Column(name = "vkupno_zavrseni_rezervacii", nullable = false) - private Long vkupno_zavrseni_rezervacii; - - @Column(name = "vkupno_otkazani_rezervacii", nullable = false) - private Long vkupno_otkazani_rezervacii; - - @Column(name = "vkupno_za_odobruvanje_rezervacii", nullable = false) - private Long vkupno_za_odobruvanje_rezervacii; -} Index: uckIO/truckio/src/main/java/project/truckio/model/Kategorija.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Kategorija.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,26 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Table(name = "kategorii",schema = "project") -@Data -public class Kategorija { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "kategorija_id", nullable = false) - private Integer kategorija_id; - - @Column(name = "kategorija_ime", nullable = false, length = 300) - private String kategorija_ime; - - public Kategorija(String kategorija_ime) { - this.kategorija_ime = kategorija_ime; - } - - public Kategorija() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Klient.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Klient.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,44 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; -import java.util.Collection; -import java.util.List; - -@Data -@Entity -@Table(name = "klienti",schema = "project") -public class Klient { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "klient_id", nullable = false) - private Integer klient_id; - - @Column(name = "klient_ime", nullable = false, length = 300) - private String klient_ime; - - @Column(name = "klient_prezime", nullable = false, length = 300) - private String klient_prezime; - - @Column(name = "klient_email", nullable = false, length = 300) - private String email; - - @Column(name = "klient_password", nullable = false, length = 300) - private String password; - - @Column(name = "klient_telefon", nullable = false, length = 300) - private String klient_telefon; - - public Klient(String klient_ime, String klient_prezime, String email, String password, String klient_telefon) { - this.klient_ime = klient_ime; - this.klient_prezime = klient_prezime; - this.email = email; - this.password = password; - this.klient_telefon = klient_telefon; - } - - public Klient() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/KompaniiKlienti.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/KompaniiKlienti.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,42 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import org.hibernate.annotations.Immutable; -import project.truckio.model.primarykeys.KompaniiKlientiID; -import project.truckio.model.primarykeys.LicencaID; - -import javax.persistence.*; - -@Data -@Entity -@Immutable -@Table(name = "kompanii_klienti",schema = "project") -public class KompaniiKlienti { - @EmbeddedId - private KompaniiKlientiID kompaniiKlientiID; - - @Column(name = "kompanija_ime", nullable = false, length = 300) - private String kompanija_ime; - - @Column(name = "klient_ime", nullable = false, length = 300) - private String klient_ime; - - @Column(name = "klient_prezime", nullable = false, length = 300) - private String klient_prezime; - - @Column(name = "suma_fakturi", nullable = false) - private Long suma_fakturi; - - @Column(name = "broj_na_rezervacii", nullable = false) - private Long broj_na_rezervacii; - - @MapsId("kompanija_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - @MapsId("klient_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "klient_id") - private Klient klient; -} Index: uckIO/truckio/src/main/java/project/truckio/model/KompaniiRuti.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/KompaniiRuti.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,28 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import org.hibernate.annotations.Immutable; -import project.truckio.model.primarykeys.KompaniiRutiID; -import project.truckio.model.primarykeys.RelacijaRezervaciiID; - -import javax.persistence.*; - -@Data -@Entity -@Immutable -@Table(name = "kompanii_ruti",schema = "project") -public class KompaniiRuti { - @EmbeddedId - private KompaniiRutiID kompaniiRutiID; - - @MapsId("kompanija_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - @Column(name = "broj_rezervacii", nullable = false) - private Long broj_rezervacii; - - @Column(name = "vkupna_zarabotka", nullable = false) - private Long vkupna_zarabotka; -} Index: uckIO/truckio/src/main/java/project/truckio/model/Kompanija.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Kompanija.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,37 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Data -@Entity -@Table(name = "kompanii",schema = "project") -public class Kompanija { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "kompanija_id", nullable = false) - private Integer kompanija_id; - - @Column(name = "kompanija_ime", nullable = false, length = 300) - private String kompanija_ime; - - @Column(name = "kompanija_adresa", nullable = false, length = 300) - private String kompanija_adresa; - - @Column(name = "kompanija_telefon", nullable = false, length = 300) - private String kompanija_telefon; - - public Kompanija(String kompanija_ime, String kompanija_adresa, String kompanija_telefon) { - this.kompanija_ime = kompanija_ime; - this.kompanija_adresa = kompanija_adresa; - this.kompanija_telefon = kompanija_telefon; - } - - public Kompanija() {} - - public String getIme() { - return kompanija_ime; - } - -} Index: uckIO/truckio/src/main/java/project/truckio/model/Licenca.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Licenca.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,33 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import project.truckio.model.primarykeys.LicencaID; - -import javax.persistence.*; -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Data -@Entity -@Table(name = "licenci",schema = "project") -public class Licenca { - @EmbeddedId - private LicencaID licenca_id; - - @Column(name = "licenca_vazi_od", nullable = false) - private LocalDate licenca_vazi_od; - - @Column(name = "licenca_vazi_do", nullable = false) - private LocalDate licenca_vazi_do; - - @MapsId("kompanija_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - -// // vrski -// @ManyToOne(fetch = FetchType.LAZY) -// @JoinColumn(name = "kompanija_id") -// private Kompanija kompanija; -} Index: uckIO/truckio/src/main/java/project/truckio/model/RelacijaRezervacii.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/RelacijaRezervacii.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,35 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import org.hibernate.annotations.Immutable; -import project.truckio.model.primarykeys.KompaniiKlientiID; -import project.truckio.model.primarykeys.RelacijaRezervaciiID; - -import javax.persistence.*; - -@Data -@Entity -@Immutable -@Table(name = "relacija_rezervacii",schema = "project") -public class RelacijaRezervacii { - @EmbeddedId - private RelacijaRezervaciiID relacijaRezervaciiID; - - @Column(name = "broj_zavrseni_rezervacii", nullable = false) - private Long broj_zavrseni_rezervacii; - - @MapsId("kompanija_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - @MapsId("pocnuva_vo_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "pocnuva_vo_id") - private Grad pocnuva_vo; - - @MapsId("zavrsuva_vo_id") - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "zavrsuva_vo_id") - private Grad zavrsuva_vo; -} Index: uckIO/truckio/src/main/java/project/truckio/model/Rezervacija.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Rezervacija.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,39 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import org.hibernate.annotations.DynamicUpdate; -import org.springframework.transaction.annotation.Transactional; - -import javax.persistence.*; - -@Entity -@Table(name = "rezervacii",schema = "project") -@Data -public class Rezervacija { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "rezervacija_id", nullable = false) - private Integer rezervacija_id; - - @Column(name = "rezervacija_status", nullable = false, length = 300) - private String rezervacija_status; - - // vrski - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "klient_id") - private Klient klient; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ruta_id") - private Ruta ruta; - - public Rezervacija(String rezervacija_status, Klient klient, Ruta ruta) { - this.rezervacija_status = rezervacija_status; - this.klient = klient; - this.ruta = ruta; - } - - public Rezervacija() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Roba.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Roba.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,37 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Table(name = "roba",schema = "project") -@Data -public class Roba { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "roba_id", nullable = false) - private Integer roba_id; - - @Column(name = "roba_kolicina", nullable = false) - private Integer roba_kolicina; - - // vrski - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "rezervacija_id") - private Rezervacija rezervacija; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kategorija_id") - private Kategorija kategorija; - - public Roba(Integer roba_kolicina, Rezervacija rezervacija, Kategorija kategorija) { - this.roba_kolicina = roba_kolicina; - this.rezervacija = rezervacija; - this.kategorija = kategorija; - } - - public Roba() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Ruta.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Ruta.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,58 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Entity -@Table(name = "ruti",schema = "project") -@Data -public class Ruta { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ruta_id", nullable = false) - private Integer ruta_id; - - @Column(name = "datum_poagjanje", nullable = false) - private LocalDate datum_poagjanje; - - @Column(name = "datum_pristignuvanje", nullable = false) - private LocalDate datum_pristiganje; - - // vrski - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "zapocnuva_vo") - private Grad zapocnuva_vo; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "zavrsuva_vo") - private Grad zavrsuva_vo; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "dispecer_id") - private Dispecer dispecer; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "vozac_id") - private Vozac vozac; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "vozilo_id") - private Vozilo vozilo; - - public Ruta(LocalDate datum_poagjanje, LocalDate datum_pristiganje, Grad zapocnuva_vo, Grad zavrsuva_vo, Vozilo vozilo, Dispecer dispecer, Vozac vozac) { - this.datum_poagjanje = datum_poagjanje; - this.datum_pristiganje = datum_pristiganje; - this.zapocnuva_vo = zapocnuva_vo; - this.zavrsuva_vo = zavrsuva_vo; - this.vozilo = vozilo; - this.dispecer = dispecer; - this.vozac = vozac; - } - - public Ruta() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Tip.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Tip.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,24 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Table(name = "tipovi",schema = "project") -@Data -public class Tip { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "tip_id", nullable = false) - private Integer tip_id; - - @Column(name = "tip_ime", nullable = false, length = 300) - private String tip_ime; - - public Tip(String tip_ime) { - this.tip_ime = tip_ime; - } - - public Tip() {} -} Index: uckIO/truckio/src/main/java/project/truckio/model/Vozac.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Vozac.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,26 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import javax.persistence.*; - -@Entity -@Table(name = "vozaci",schema = "project") -@Data -public class Vozac { - @Id - @Column(name = "vozac_id", nullable = false) - private Integer vozac_id; - - @MapsId - @OneToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "vozac_id", nullable = false) - private Vraboten vraboten; - - public Vozac(Vraboten vraboten) { - this.vraboten = vraboten; - } - - public Vozac() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/Vozilo.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Vozilo.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,42 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Entity -@Table(name = "vozila",schema = "project") -@Data -public class Vozilo { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "vozilo_id", nullable = false) - private Integer vozilo_id; - - @Column(name = "vozilo_marka", nullable = false, length = 300) - private String vozilo_marka; - - @Column(name = "vozilo_kapacitet", nullable = false) - private Integer vozilo_kapacitet; - - - // vrski so kompanija tip i vozac - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "tip_id") - private Tip tip; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "vozac_id") - private Vozac vozac; - - public Vozilo(String vozilo_marka, Integer vozilo_kapacitet, Kompanija kompanija, Tip tip, Vozac vozac) { - this.vozilo_marka = vozilo_marka; - this.vozilo_kapacitet = vozilo_kapacitet; - } - - public Vozilo() {} -} Index: uckIO/truckio/src/main/java/project/truckio/model/Vraboten.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/Vraboten.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,42 +1,0 @@ -package project.truckio.model; - -import lombok.Data; - -import javax.persistence.*; - -@Data -@Entity -@Table(name = "vraboteni",schema = "project") -public class Vraboten { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "vraboten_id", nullable = false) - private Integer vraboten_id; - - @Column(name = "vraboten_ime", nullable = false, length = 300) - private String vraboten_ime; - - @Column(name = "vraboten_prezime", nullable = false, length = 300) - private String vraboten_prezime; - - @Column(name = "vraboten_email", nullable = false, length = 300) - private String email; - - @Column(name = "vraboten_password", nullable = false, length = 300) - private String password; - - // vrska so kompanija - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "kompanija_id") - private Kompanija kompanija; - - public Vraboten(String vraboten_ime, String vraboten_prezime, String vraboten_email, String vraboten_password, Kompanija kompanija) { - this.vraboten_ime = vraboten_ime; - this.vraboten_prezime = vraboten_prezime; - this.email = vraboten_email; - this.password = vraboten_password; - this.kompanija = kompanija; - } - - public Vraboten() {} -} Index: uckIO/truckio/src/main/java/project/truckio/model/VrabotenTelefoni.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/VrabotenTelefoni.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,29 +1,0 @@ -package project.truckio.model; - -import lombok.Data; -import project.truckio.model.primarykeys.VrabotenTelefoniID; - -import javax.persistence.*; - -@Data -@Entity -@Table(name = "vraboteni_telefoni",schema = "project") -public class VrabotenTelefoni { - - @EmbeddedId - private VrabotenTelefoniID vrabotenTelefoniID; - - @MapsId("vraboten_id") - @ManyToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "vraboten_id", nullable = false) - private Vraboten vraboten; - - public VrabotenTelefoni(VrabotenTelefoniID vrabotenTelefoniID, Vraboten vraboten) { - this.vrabotenTelefoniID = vrabotenTelefoniID; - this.vraboten = vraboten; - } - - public VrabotenTelefoni() { - - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidArgumentException.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidArgumentException.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -package project.truckio.model.exceptions; - -public class InvalidArgumentException extends RuntimeException { - public InvalidArgumentException() { - super("Невалидни аргументи."); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidUserCredentialsException.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidUserCredentialsException.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -package project.truckio.model.exceptions; - -public class InvalidUserCredentialsException extends RuntimeException { - public InvalidUserCredentialsException() { - super("Невалидни креденцијали."); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidUsernameOrPasswordException.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/InvalidUsernameOrPasswordException.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -package project.truckio.model.exceptions; - -public class InvalidUsernameOrPasswordException extends RuntimeException { - public InvalidUsernameOrPasswordException() { - super("Невалидни корисничко име или лозинка."); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/PasswordsDoNotMatch.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/PasswordsDoNotMatch.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -package project.truckio.model.exceptions; - -public class PasswordsDoNotMatch extends RuntimeException { - public PasswordsDoNotMatch() { - super("Лозинките не се совпаѓаат."); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/UserNotFoundException.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/UserNotFoundException.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.model.exceptions; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -@ResponseStatus(HttpStatus.NOT_FOUND) -public class UserNotFoundException extends RuntimeException { - public UserNotFoundException(String username) { - super(String.format("Не е пронајден корисник со корисничко име %s.", username)); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/exceptions/UsernameAlreadyExistsException.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/exceptions/UsernameAlreadyExistsException.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,7 +1,0 @@ -package project.truckio.model.exceptions; - -public class UsernameAlreadyExistsException extends RuntimeException{ - public UsernameAlreadyExistsException(String username){ - super(String.format("Корисник со корисничко име %s веќе постои.", username)); - } -} Index: uckIO/truckio/src/main/java/project/truckio/model/passwordencrypt/CryptWithMD5.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/model/passwordencrypt/CryptWithMD5.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,28 +1,0 @@ -package project.truckio.model.passwordencrypt; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class CryptWithMD5 { - private static MessageDigest md; - - public static String cryptWithMD5(String pass){ - try { - md = MessageDigest.getInstance("MD5"); - byte[] passBytes = pass.getBytes(); - md.reset(); - byte[] digested = md.digest(passBytes); - StringBuffer sb = new StringBuffer(); - for(int i=0;i { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/DispecerRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/DispecerRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,17 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Dispecer; - -import java.util.List; - -@Repository -public interface DispecerRepository extends JpaRepository { - - @Query(value = "select * from project.dispeceri d join project.vraboteni v on d.dispecer_id=v.vraboten_id " + - "where v.kompanija_id = :kompanija_id", nativeQuery = true) - public List findAllByCompany(Integer kompanija_id); - -} Index: uckIO/truckio/src/main/java/project/truckio/repository/FakturaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/FakturaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Faktura; -import project.truckio.model.Rezervacija; - -@Repository -public interface FakturaRepository extends JpaRepository { - public Faktura findFakturaByRezervacija(Rezervacija rezervacija); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/GradRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/GradRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Grad; - -@Repository -public interface GradRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/IzvestajRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/IzvestajRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Izvestaj; -import project.truckio.model.Vozilo; - -import java.util.List; - -@Repository -public interface IzvestajRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/KategorijaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/KategorijaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Kategorija; - -@Repository -public interface KategorijaRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/KlientRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/KlientRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Klient; - -import java.util.Optional; -@Repository -public interface KlientRepository extends JpaRepository { - - Optional findByEmail(String email); - Optional findByEmailAndPassword(String email, String password); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/KompaniiKlientiRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/KompaniiKlientiRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.KompaniiKlienti; -import project.truckio.model.Kompanija; - -import java.util.List; - -@Repository -public interface KompaniiKlientiRepository extends JpaRepository { - public List findAllByKompanija(Kompanija kompanija); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/KompaniiRutiRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/KompaniiRutiRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.KompaniiRuti; -import project.truckio.model.Kompanija; - -import java.util.List; -@Repository -public interface KompaniiRutiRepository extends JpaRepository { - public List findAllByKompanija(Kompanija kompanija); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/KompanijaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/KompanijaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Kompanija; - -import java.util.Optional; - -@Repository -public interface KompanijaRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/LicencaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/LicencaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Licenca; - -@Repository -public interface LicencaRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/RelacijaRezervaciiRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/RelacijaRezervaciiRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.KompaniiKlienti; -import project.truckio.model.Kompanija; -import project.truckio.model.RelacijaRezervacii; - -import java.util.List; - -@Repository -public interface RelacijaRezervaciiRepository extends JpaRepository { - public List findAllByKompanija(Kompanija kompanija); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/RezervacijaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/RezervacijaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,29 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Rezervacija; - -import java.util.List; - -@Repository -public interface RezervacijaRepository extends JpaRepository{ - @Query(value = "select * from project.rezervacii r where r.klient_id = :klient_id", nativeQuery = true) - public List findMyReservations(Integer klient_id); - @Query(value = "select * from project.rezervacii r where r.ruta_id = :ruta_id " + - "and (lower(r.rezervacija_status) LIKE 'активна' " + - "or lower(r.rezervacija_status) LIKE 'за одобрување')", nativeQuery = true) - List findReservationsForRoute(Integer ruta_id); - - @Query(value = "select * from project.rezervacii r " + - "join project.ruti ruti on r.ruta_id = ruti.ruta_id " + - "join project.vozila v on ruti.vozilo_id = v.vozilo_id " + - "where lower(r.rezervacija_status) LIKE 'за одобрување' and v.kompanija_id = :kompanija_id", nativeQuery = true) - List findAllReservationsByCompany(Integer kompanija_id); - - @Query(value = "select * from project.rezervacii r " + - " where lower(r.rezervacija_status) LIKE 'активна' " + - " and r.ruta_id = :ruta_id ", nativeQuery = true) - List findByRuta(Integer ruta_id); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/RobaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/RobaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Roba; - -import java.util.List; - -@Repository -public interface RobaRepository extends JpaRepository { - @Query(value = "select * from project.roba r where r.rezervacija_id = :rezervacija_id", nativeQuery = true) - List findRobaForReservation(Integer rezervacija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/RutaRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/RutaRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,36 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Ruta; - -import java.time.LocalDate; -import java.util.List; - -@Repository -public interface RutaRepository extends JpaRepository{ - @Query(value = "select * from project.ruti r where r.datum_poagjanje > now()", nativeQuery = true) - public List findAllAvailable(); - - @Query(value = "select * from project.ruti r join project.vozila v on r.vozilo_id=v.vozilo_id " + - "where v.kompanija_id = :kompanija_id", nativeQuery = true) - public List findAllByCompany(Integer kompanija_id); - - @Query(value = "select * from project.ruti r " + - " join project.rezervacii rezervacija on r.ruta_id = rezervacija.ruta_id" + - " join project.vozaci vozac on r.vozac_id = vozac.vozac_id" + - " where " + - " lower(rezervacija.rezervacija_status) LIKE 'активна' and vozac.vozac_id = :vozac_id ", nativeQuery = true) - public List findAllActiveByVozac(Integer vozac_id); - - @Query(value = "select * from project.ruti r " + - " join project.rezervacii rezervacija on r.ruta_id = rezervacija.ruta_id" + - " join project.dispeceri dispecer on r.dispecer_id = dispecer.dispecer_id" + - " where " + - " lower(rezervacija.rezervacija_status) LIKE 'активна' and dispecer.dispecer_id = :dispecer_id ", nativeQuery = true) - public List findAllActiveByDispecer(Integer dispecer_id); - - @Query(value = "select * from project.ruti r where r.datum_poagjanje > :fromDate and r.datum_pristignuvanje < :toDate", nativeQuery = true) - public List findAllByDatum_poagjanjeAfterAndDatum_pristiganjeBefore(LocalDate fromDate, LocalDate toDate); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/TipRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/TipRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Tip; - -@Repository -public interface TipRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/VozacRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/VozacRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,9 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Vozac; - -@Repository -public interface VozacRepository extends JpaRepository { -} Index: uckIO/truckio/src/main/java/project/truckio/repository/VoziloRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/VoziloRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,16 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import project.truckio.model.Ruta; -import project.truckio.model.Vozilo; - -import java.util.List; - -@Repository -public interface VoziloRepository extends JpaRepository { - @Query(value = "select * from project.vozila v " + - "where v.kompanija_id = :kompanija_id", nativeQuery = true) - public List findAllByCompany(Integer kompanija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/VrabotenRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/VrabotenRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Klient; -import project.truckio.model.Vraboten; - -import java.util.Optional; - -@Repository -public interface VrabotenRepository extends JpaRepository{ - Optional findByEmailAndPassword(String email, String password); -} Index: uckIO/truckio/src/main/java/project/truckio/repository/VrabotenTelefoniRepository.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/repository/VrabotenTelefoniRepository.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import project.truckio.model.Vraboten; -import project.truckio.model.VrabotenTelefoni; - -import java.util.List; - -@Repository -public interface VrabotenTelefoniRepository extends JpaRepository { - List findAllByVraboten(Vraboten vraboten); -} Index: uckIO/truckio/src/main/java/project/truckio/service/AdministratorService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/AdministratorService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Administrator; - -import java.util.List; -import java.util.Optional; - -public interface AdministratorService { - Administrator registerAdministrator(Integer vrabotenId); - Administrator findById(Integer administratorId); - List findAll(); - - Optional findRole(Integer administratorId); -} Index: uckIO/truckio/src/main/java/project/truckio/service/DispecerService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/DispecerService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Dispecer; - -import java.util.List; -import java.util.Optional; - -public interface DispecerService { - Dispecer registerDispecer(Integer vrabotenId); - Dispecer findById(Integer dispecerId); - List findAll(); - Optional findRole(Integer dispecerId); - List findAllByCompany(Integer kompanijaId); -} Index: uckIO/truckio/src/main/java/project/truckio/service/FakturaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/FakturaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Faktura; -import project.truckio.model.Rezervacija; - -import java.util.List; -import java.util.Optional; - -public interface FakturaService { - Faktura addFaktura(Integer faktura_iznos, Integer rezervacijaId, Integer administratorId); - Optional findById(Integer fakturaId); - List findAll(); - Faktura findFakturaByRezervacija(Rezervacija rezervacija); -} Index: uckIO/truckio/src/main/java/project/truckio/service/GradService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/GradService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Grad; - -import java.util.List; -import java.util.Optional; - -public interface GradService { - Grad registerGrad(String gradIme); - Optional findById(Integer gradId); - List findAll(); -} Index: uckIO/truckio/src/main/java/project/truckio/service/IzvestajService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/IzvestajService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.service; - -import org.springframework.stereotype.Service; -import project.truckio.model.Izvestaj; -import project.truckio.model.Kompanija; - -import java.util.List; - -public interface IzvestajService { - List listAll(); - Izvestaj findById(Integer kompanija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/service/KategorijaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/KategorijaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Kategorija; - -import java.util.List; -import java.util.Optional; - -public interface KategorijaService { - Kategorija addKategorija(String kategorijaIme); - Kategorija findById(Integer kategorijaId); - List findAll(); -} Index: uckIO/truckio/src/main/java/project/truckio/service/KlientService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/KlientService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Klient; - -import java.util.List; -import java.util.Optional; - -public interface KlientService { - Klient register(String ime, String prezime, String password, String repeatPassword, String email, String telefon); - Klient login(String email, String password); - Optional findById(Integer klientId); - List findAll(); -} Index: uckIO/truckio/src/main/java/project/truckio/service/KompaniiKlientiService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/KompaniiKlientiService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Izvestaj; -import project.truckio.model.KompaniiKlienti; - -import java.util.List; - -public interface KompaniiKlientiService { - List listAll(); - List findByCompanyId(Integer kompanija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/service/KompaniiRutiService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/KompaniiRutiService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.KompaniiKlienti; -import project.truckio.model.KompaniiRuti; - -import java.util.List; - -public interface KompaniiRutiService { - List listAll(); - List findByCompanyId(Integer kompanija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/service/KompanijaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/KompanijaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Kompanija; - -import java.util.List; - -public interface KompanijaService { - List listAll(); - Kompanija findById(Integer kompanija_id); - - Kompanija registerKompanija(String kompanija_ime, String kompanija_adresa, String kompanija_telefon); -} Index: uckIO/truckio/src/main/java/project/truckio/service/LicencaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/LicencaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,12 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Licenca; - -import java.util.List; -import java.util.Optional; - -public interface LicencaService { - //Licenca addLicenca(); - Optional findById(Integer licencaId); - List findAll(); -} Index: uckIO/truckio/src/main/java/project/truckio/service/RelacijaRezervaciiService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/RelacijaRezervaciiService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.KompaniiKlienti; -import project.truckio.model.RelacijaRezervacii; - -import java.util.List; - -public interface RelacijaRezervaciiService { - List listAll(); - List findByCompanyId(Integer kompanija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/service/RezervacijaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/RezervacijaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,19 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Rezervacija; - -import java.util.List; -import java.util.Optional; - -public interface RezervacijaService { - Rezervacija addRezervacija(String rezervacija_status, Integer klientId, Integer rutaId); - Rezervacija findById(Integer rezervacijaId); - List findAll(); - List findMyReservations(Integer klient_id); - List findReservationsForRoute(Integer ruta_id); - List finAllRezervaciiByCompany(Integer kompanija_id); - List findByRuta(Integer ruta_id); - - void updateStatus(Rezervacija rezervacija, String status); - -} Index: uckIO/truckio/src/main/java/project/truckio/service/RobaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/RobaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Roba; - -import java.util.List; -import java.util.Optional; - -public interface RobaService { - Roba addRoba(Integer roba_kolicina, Integer rezervacijaId, Integer kategorijaId); - Optional findById(Integer robaId); - List findAll(); - - List findRobaForReservation(Integer rezervacija_id); -} Index: uckIO/truckio/src/main/java/project/truckio/service/RutaService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/RutaService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,19 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Ruta; - -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; - -public interface RutaService { - Ruta addRuta(LocalDate datum_poagjanje, LocalDate datum_pristiganje, Integer zapocnuvaVoId, Integer zavrsuvaVoId, Integer voziloId, Integer dispecerId, Integer vozacId); - Ruta findById(Integer rutaId); - List findAll(); - List findAllByCompany(Integer kompanijaId); - List findAllAvailable(); - List findAllActiveByVozac(Integer vozac_id); - List findAllActiveByDispecer(Integer dispecer_id); - - List findAllInDateInterval(LocalDate from, LocalDate to); -} Index: uckIO/truckio/src/main/java/project/truckio/service/TipService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/TipService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Tip; - -import java.util.List; - -public interface TipService { - Tip addTip(String tipIme); - Tip findById(Integer tipId); - List findAll(); -} Index: uckIO/truckio/src/main/java/project/truckio/service/VozacService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/VozacService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Administrator; -import project.truckio.model.Vozac; - -import java.util.List; -import java.util.Optional; - -public interface VozacService { - Vozac registerVozac(Integer vrabotenId); - Vozac findById(Integer vozacId); - List findAll(); - Optional findRole(Integer vozacId); -} Index: uckIO/truckio/src/main/java/project/truckio/service/VoziloService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/VoziloService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Vozilo; - -import java.util.List; -import java.util.Optional; - -public interface VoziloService { - Vozilo registerVozilo(String vozilo_marka, Integer vozilo_kapacitet, Integer kompanijaId, Integer tipId, Integer vozacId); - Optional findById(Integer voziloId); - List findAll(); - List findAllByCompany(Integer kompanijaId); -} Index: uckIO/truckio/src/main/java/project/truckio/service/VrabotenService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/VrabotenService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,14 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.Klient; -import project.truckio.model.Vraboten; - -import java.util.List; -import java.util.Optional; - -public interface VrabotenService { - Vraboten registerVraboten(String vraboten_ime, String vraboten_prezime, String vraboten_email, String vraboten_password, Integer kompanija_id); - Optional findById(Integer vrabotenId); - List listAll(); - Vraboten login(String email, String password); -} Index: uckIO/truckio/src/main/java/project/truckio/service/VrabotenTelefoniService.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/VrabotenTelefoniService.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -package project.truckio.service; - -import project.truckio.model.VrabotenTelefoni; - -import java.util.List; - -public interface VrabotenTelefoniService { - VrabotenTelefoni addVrabotenTelefon(Integer vrabotenId, String telefon); - List findAll(); - List findAllByVraboten(Integer vrabotenId); -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/AdministratorServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/AdministratorServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,44 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Administrator; -import project.truckio.model.Vraboten; -import project.truckio.repository.AdministratorRepository; -import project.truckio.repository.VrabotenRepository; -import project.truckio.service.AdministratorService; - -import java.util.List; -import java.util.Optional; - -@Service -public class AdministratorServiceImpl implements AdministratorService { - - private final AdministratorRepository administratorRepository; - private final VrabotenRepository vrabotenRepository; - - public AdministratorServiceImpl(AdministratorRepository administratorRepository, VrabotenRepository vrabotenRepository) { - this.administratorRepository = administratorRepository; - this.vrabotenRepository = vrabotenRepository; - } - - @Override - public Administrator registerAdministrator(Integer vrabotenId) { - Vraboten vraboten = vrabotenRepository.findById(vrabotenId).get(); - return administratorRepository.save(new Administrator(vraboten)); - } - - @Override - public Administrator findById(Integer administratorId) { - return administratorRepository.findById(administratorId).get(); - } - - @Override - public List findAll() { - return administratorRepository.findAll(); - } - - @Override - public Optional findRole(Integer administratorId) { - return administratorRepository.findById(administratorId); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/DispecerServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/DispecerServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,50 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Administrator; -import project.truckio.model.Dispecer; -import project.truckio.model.Vraboten; -import project.truckio.repository.DispecerRepository; -import project.truckio.repository.VrabotenRepository; -import project.truckio.service.DispecerService; - -import java.util.List; -import java.util.Optional; - -@Service -public class DispecerServiceImpl implements DispecerService { - - private final DispecerRepository dispecerRepository; - private final VrabotenRepository vrabotenRepository; - - public DispecerServiceImpl(DispecerRepository dispecerRepository, VrabotenRepository vrabotenRepository) { - this.dispecerRepository = dispecerRepository; - this.vrabotenRepository = vrabotenRepository; - } - - @Override - public Dispecer registerDispecer(Integer vrabotenId) { - Vraboten vraboten = vrabotenRepository.findById(vrabotenId).get(); - return dispecerRepository.save(new Dispecer(vraboten)); - } - - @Override - public Dispecer findById(Integer dispecerId) { - return dispecerRepository.findById(dispecerId).get(); - } - - @Override - public List findAll() { - return dispecerRepository.findAll(); - } - - @Override - public Optional findRole(Integer dispecerId) { - return dispecerRepository.findById(dispecerId); - } - - @Override - public List findAllByCompany(Integer kompanijaId) { - return dispecerRepository.findAllByCompany(kompanijaId); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/FakturaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/FakturaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,50 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Administrator; -import project.truckio.model.Faktura; -import project.truckio.model.Rezervacija; -import project.truckio.repository.AdministratorRepository; -import project.truckio.repository.FakturaRepository; -import project.truckio.repository.RezervacijaRepository; -import project.truckio.service.FakturaService; - -import java.util.List; -import java.util.Optional; - -@Service -public class FakturaServiceImpl implements FakturaService { - - private final FakturaRepository fakturaRepository; - private final RezervacijaRepository rezervacijaRepository; - private final AdministratorRepository administratorRepository; - - public FakturaServiceImpl(FakturaRepository fakturaRepository, RezervacijaRepository rezervacijaRepository, AdministratorRepository administratorRepository) { - this.fakturaRepository = fakturaRepository; - this.rezervacijaRepository = rezervacijaRepository; - this.administratorRepository = administratorRepository; - } - - @Override - public Faktura addFaktura(Integer faktura_iznos, Integer rezervacijaId, Integer administratorId) { - Rezervacija rezervacija = rezervacijaRepository.findById(rezervacijaId).get(); - Administrator administrator = administratorRepository.findById(administratorId).get(); - Faktura faktura = new Faktura(faktura_iznos, rezervacija, administrator); - return fakturaRepository.save(faktura); - } - - @Override - public Optional findById(Integer fakturaId) { - return fakturaRepository.findById(fakturaId); - } - - @Override - public List findAll() { - return fakturaRepository.findAll(); - } - - @Override - public Faktura findFakturaByRezervacija(Rezervacija rezervacija) { - return fakturaRepository.findFakturaByRezervacija(rezervacija); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/GradServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/GradServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,34 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Grad; -import project.truckio.repository.GradRepository; -import project.truckio.service.GradService; - -import java.util.List; -import java.util.Optional; - -@Service -public class GradServiceImpl implements GradService { - - private final GradRepository gradRepository; - - public GradServiceImpl(GradRepository gradRepository) { - this.gradRepository = gradRepository; - } - - @Override - public Grad registerGrad(String gradIme) { - return gradRepository.save(new Grad(gradIme)); - } - - @Override - public Optional findById(Integer gradId) { - return gradRepository.findById(gradId); - } - - @Override - public List findAll() { - return gradRepository.findAll(); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/IzvestajServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/IzvestajServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,27 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Izvestaj; -import project.truckio.repository.IzvestajRepository; -import project.truckio.service.IzvestajService; - -import java.util.List; -@Service -public class IzvestajServiceImpl implements IzvestajService { - - private final IzvestajRepository izvestajRepository; - - public IzvestajServiceImpl(IzvestajRepository izvestajRepository) { - this.izvestajRepository = izvestajRepository; - } - - @Override - public List listAll() { - return izvestajRepository.findAll(); - } - - @Override - public Izvestaj findById(Integer kompanija_id) { - return izvestajRepository.findById(kompanija_id).get(); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/KategorijaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/KategorijaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,34 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Kategorija; -import project.truckio.repository.KategorijaRepository; -import project.truckio.service.KategorijaService; - -import java.util.List; -import java.util.Optional; - -@Service -public class KategorijaServiceImpl implements KategorijaService { - - private final KategorijaRepository kategorijaRepository; - - public KategorijaServiceImpl(KategorijaRepository kategorijaRepository) { - this.kategorijaRepository = kategorijaRepository; - } - - @Override - public Kategorija addKategorija(String kategorijaIme) { - return kategorijaRepository.save(new Kategorija(kategorijaIme)); - } - - @Override - public Kategorija findById(Integer kategorijaId) { - return kategorijaRepository.findById(kategorijaId).get(); - } - - @Override - public List findAll() { - return kategorijaRepository.findAll(); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/KlientServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/KlientServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,60 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.passwordencrypt.CryptWithMD5; -import project.truckio.model.Klient; -import project.truckio.model.exceptions.*; -import project.truckio.repository.KlientRepository; -import project.truckio.service.KlientService; - -import java.util.List; -import java.util.Optional; - -@Service -public class KlientServiceImpl implements KlientService { - - private final KlientRepository klientRepository; - //private final PasswordEncoder passwordEncoder; - - public KlientServiceImpl(KlientRepository klientRepository) { - this.klientRepository = klientRepository; - //this.passwordEncoder = passwordEncoder; - } - - @Override - public Klient register(String ime, String prezime, String password, String repeatPassword, String email, String telefon) { - if(email == null || email.isEmpty() || password==null || password.isEmpty()) { - throw new InvalidUsernameOrPasswordException(); - } - - if(!password.equals(repeatPassword)) throw new PasswordsDoNotMatch(); - - if(klientRepository.findByEmail(email).isPresent()) { - throw new UsernameAlreadyExistsException(email); - } - - Klient klient = new Klient(ime, prezime, email, CryptWithMD5.cryptWithMD5(password), telefon); - return klientRepository.save(klient); - - } - - @Override - public Klient login(String email, String password) { - if(email == null || email.isEmpty() || password==null || password.isEmpty()) { - throw new InvalidArgumentException(); - } - return klientRepository.findByEmailAndPassword(email, CryptWithMD5.cryptWithMD5(password)).orElseThrow(InvalidUsernameOrPasswordException::new); - } - - @Override - public Optional findById(Integer klientId) { - return klientRepository.findById(klientId); - } - - @Override - public List findAll() { - return klientRepository.findAll(); - } - - -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/KompaniiKlientiServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/KompaniiKlientiServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,33 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.KompaniiKlienti; -import project.truckio.model.Kompanija; -import project.truckio.repository.KompaniiKlientiRepository; -import project.truckio.service.KompaniiKlientiService; -import project.truckio.service.KompanijaService; - -import java.util.List; - -@Service -public class KompaniiKlientiServiceImpl implements KompaniiKlientiService { - - private final KompaniiKlientiRepository kompaniiKlientiRepository; - private final KompanijaService kompanijaService; - - public KompaniiKlientiServiceImpl(KompaniiKlientiRepository kompaniiKlientiRepository, KompanijaService kompanijaService) { - this.kompaniiKlientiRepository = kompaniiKlientiRepository; - this.kompanijaService = kompanijaService; - } - - @Override - public List listAll() { - return kompaniiKlientiRepository.findAll(); - } - - @Override - public List findByCompanyId(Integer kompanija_id) { - Kompanija kompanija = kompanijaService.findById(kompanija_id); - return kompaniiKlientiRepository.findAllByKompanija(kompanija); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/KompaniiRutiServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/KompaniiRutiServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,32 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.KompaniiRuti; -import project.truckio.model.Kompanija; -import project.truckio.repository.KompaniiRutiRepository; -import project.truckio.service.KompaniiRutiService; -import project.truckio.service.KompanijaService; - -import java.util.List; -@Service -public class KompaniiRutiServiceImpl implements KompaniiRutiService { - - private final KompaniiRutiRepository kompaniiRutiRepository; - private final KompanijaService kompanijaService; - - public KompaniiRutiServiceImpl(KompaniiRutiRepository kompaniiRutiRepository, KompanijaService kompanijaService) { - this.kompaniiRutiRepository = kompaniiRutiRepository; - this.kompanijaService = kompanijaService; - } - - @Override - public List listAll() { - return kompaniiRutiRepository.findAll(); - } - - @Override - public List findByCompanyId(Integer kompanija_id) { - Kompanija kompanija = kompanijaService.findById(kompanija_id); - return kompaniiRutiRepository.findAllByKompanija(kompanija); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/KompanijaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/KompanijaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,34 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Kompanija; -import project.truckio.repository.KompanijaRepository; -import project.truckio.service.KompanijaService; - -import java.util.List; - -@Service -public class KompanijaServiceImpl implements KompanijaService { - private final KompanijaRepository kompanijaRepository; - - public KompanijaServiceImpl(KompanijaRepository kompanijaRepository) { - this.kompanijaRepository = kompanijaRepository; - } - - @Override - public List listAll() { - return this.kompanijaRepository.findAll(); - } - - @Override - public Kompanija findById(Integer kompanija_id) { - return this.kompanijaRepository.findById(kompanija_id).get(); - } - - @Override - public Kompanija registerKompanija(String kompanija_ime, String kompanija_adresa, String kompanija_telefon) { - return kompanijaRepository.save(new Kompanija(kompanija_ime, kompanija_adresa, kompanija_telefon)); - } - - -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/LicencaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/LicencaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,29 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Licenca; -import project.truckio.repository.LicencaRepository; -import project.truckio.service.LicencaService; - -import java.util.List; -import java.util.Optional; - -@Service -public class LicencaServiceImpl implements LicencaService { - - private final LicencaRepository licencaRepository; - - public LicencaServiceImpl(LicencaRepository licencaRepository) { - this.licencaRepository = licencaRepository; - } - - @Override - public Optional findById(Integer licencaId) { - return licencaRepository.findById(licencaId); - } - - @Override - public List findAll() { - return licencaRepository.findAll(); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/RelacijaRezervaciiServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/RelacijaRezervaciiServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,33 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Kompanija; -import project.truckio.model.RelacijaRezervacii; -import project.truckio.repository.RelacijaRezervaciiRepository; -import project.truckio.service.KompanijaService; -import project.truckio.service.RelacijaRezervaciiService; - -import java.util.List; - -@Service -public class RelacijaRezervaciiServiceImpl implements RelacijaRezervaciiService { - - private final RelacijaRezervaciiRepository relacijaRezervaciiRepository; - private final KompanijaService kompanijaService; - - public RelacijaRezervaciiServiceImpl(RelacijaRezervaciiRepository relacijaRezervaciiRepository, KompanijaService kompanijaService) { - this.relacijaRezervaciiRepository = relacijaRezervaciiRepository; - this.kompanijaService = kompanijaService; - } - - @Override - public List listAll() { - return relacijaRezervaciiRepository.findAll(); - } - - @Override - public List findByCompanyId(Integer kompanija_id) { - Kompanija kompanija = kompanijaService.findById(kompanija_id); - return relacijaRezervaciiRepository.findAllByKompanija(kompanija); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/RezervacijaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/RezervacijaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,71 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Klient; -import project.truckio.model.Rezervacija; -import project.truckio.model.Ruta; -import project.truckio.repository.KlientRepository; -import project.truckio.repository.RezervacijaRepository; -import project.truckio.repository.RutaRepository; -import project.truckio.service.RezervacijaService; - -import java.util.List; -import java.util.Optional; - -@Service -public class RezervacijaServiceImpl implements RezervacijaService { - - private final RezervacijaRepository rezervacijaRepository; - private final KlientRepository klientRepository; - private final RutaRepository rutaRepository; - - public RezervacijaServiceImpl(RezervacijaRepository rezervacijaRepository, KlientRepository klientRepository, RutaRepository rutaRepository) { - this.rezervacijaRepository = rezervacijaRepository; - this.klientRepository = klientRepository; - this.rutaRepository = rutaRepository; - } - - @Override - public Rezervacija addRezervacija(String rezervacija_status, Integer klientId, Integer rutaId) { - Klient klient = klientRepository.findById(klientId).get(); - Ruta ruta = rutaRepository.findById(rutaId).get(); - Rezervacija rezervacija = new Rezervacija(rezervacija_status, klient, ruta); - return rezervacijaRepository.save(rezervacija); - } - - @Override - public Rezervacija findById(Integer rezervacijaId) { - return rezervacijaRepository.findById(rezervacijaId).get(); - } - - @Override - public List findAll() { - return rezervacijaRepository.findAll(); - } - - @Override - public List findMyReservations(Integer klient_id) { - return rezervacijaRepository.findMyReservations(klient_id); - } - - @Override - public List findReservationsForRoute(Integer ruta_id) { - return rezervacijaRepository.findReservationsForRoute(ruta_id); - } - - @Override - public List finAllRezervaciiByCompany(Integer kompanija_id) { - return rezervacijaRepository.findAllReservationsByCompany(kompanija_id); - } - - @Override - public List findByRuta(Integer ruta_id) { - return this.rezervacijaRepository.findByRuta(ruta_id); - } - - @Override - public void updateStatus(Rezervacija rezervacija, String status) { - rezervacija.setRezervacija_status(status); - this.rezervacijaRepository.save(rezervacija); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/RobaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/RobaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,51 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Kategorija; -import project.truckio.model.Rezervacija; -import project.truckio.model.Roba; -import project.truckio.repository.KategorijaRepository; -import project.truckio.repository.RezervacijaRepository; -import project.truckio.repository.RobaRepository; -import project.truckio.service.RobaService; - -import java.util.List; -import java.util.Optional; - -@Service -public class RobaServiceImpl implements RobaService { - - private final RobaRepository robaRepository; - private final RezervacijaRepository rezervacijaRepository; - private final KategorijaRepository kategorijaRepository; - - public RobaServiceImpl(RobaRepository robaRepository, RezervacijaRepository rezervacijaRepository, KategorijaRepository kategorijaRepository) { - this.robaRepository = robaRepository; - this.rezervacijaRepository = rezervacijaRepository; - this.kategorijaRepository = kategorijaRepository; - } - - @Override - public Roba addRoba(Integer roba_kolicina, Integer rezervacijaId, Integer kategorijaId) { - Rezervacija rezervacija = rezervacijaRepository.findById(rezervacijaId).get(); - Kategorija kategorija = kategorijaRepository.findById(kategorijaId).get(); - Roba roba = new Roba(roba_kolicina, rezervacija, kategorija); - - return robaRepository.save(roba); - } - - @Override - public Optional findById(Integer robaId) { - return robaRepository.findById(robaId); - } - - @Override - public List findAll() { - return robaRepository.findAll(); - } - - @Override - public List findRobaForReservation(Integer rezervacija_id) { - return robaRepository.findRobaForReservation(rezervacija_id); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/RutaServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/RutaServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,74 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.*; -import project.truckio.repository.*; -import project.truckio.service.RutaService; - -import java.time.LocalDate; -import java.util.List; - -@Service -public class RutaServiceImpl implements RutaService { - - private final GradRepository gradRepository; - private final DispecerRepository dispecerRepository; - private final VozacRepository vozacRepository; - private final RutaRepository rutaRepository; - private final VoziloRepository voziloRepository; - - public RutaServiceImpl(GradRepository gradRepository, DispecerRepository dispecerRepository, VozacRepository vozacRepository, RutaRepository rutaRepository, VoziloRepository voziloRepository) { - this.gradRepository = gradRepository; - this.dispecerRepository = dispecerRepository; - this.vozacRepository = vozacRepository; - this.rutaRepository = rutaRepository; - this.voziloRepository = voziloRepository; - } - - @Override - public Ruta addRuta(LocalDate datum_poagjanje, LocalDate datum_pristiganje, Integer zapocnuvaVoId, Integer zavrsuvaVoId, Integer voziloId, Integer dispecerId, Integer vozacId) { - Grad zapocnuva_vo = gradRepository.findById(zapocnuvaVoId).get(); - Grad zavrsuva_vo = gradRepository.findById(zavrsuvaVoId).get(); - Vozilo vozilo = voziloRepository.findById(voziloId).get(); - Dispecer dispecer = dispecerRepository.findById(dispecerId).get(); - Vozac vozac = vozacRepository.findById(vozacId).get(); - - Ruta ruta = new Ruta(datum_poagjanje, datum_pristiganje, zapocnuva_vo, zavrsuva_vo, vozilo, dispecer, vozac); - return rutaRepository.save(ruta); - } - - @Override - public Ruta findById(Integer rutaId) { - return rutaRepository.findById(rutaId).get(); - } - - @Override - public List findAll() { - return rutaRepository.findAll(); - } - - @Override - public List findAllByCompany(Integer kompanijaId) { - return rutaRepository.findAllByCompany(kompanijaId); - } - - @Override - public List findAllAvailable() { - return rutaRepository.findAllAvailable(); - } - - @Override - public List findAllActiveByVozac(Integer vozac_id) { - return this.rutaRepository.findAllActiveByVozac(vozac_id); - } - - @Override - public List findAllActiveByDispecer(Integer dispecer_id) { - return this.rutaRepository.findAllActiveByDispecer(dispecer_id); - } - - @Override - public List findAllInDateInterval(LocalDate from, LocalDate to) { - return this.rutaRepository.findAllByDatum_poagjanjeAfterAndDatum_pristiganjeBefore(from, to); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/TipServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/TipServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,33 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Tip; -import project.truckio.repository.TipRepository; -import project.truckio.service.TipService; - -import java.util.List; - -@Service -public class TipServiceImpl implements TipService { - - private final TipRepository tipRepository; - - public TipServiceImpl(TipRepository tipRepository) { - this.tipRepository = tipRepository; - } - - @Override - public Tip addTip(String tipIme) { - return tipRepository.save(new Tip(tipIme)); - } - - @Override - public Tip findById(Integer tipId) { - return tipRepository.findById(tipId).get(); - } - - @Override - public List findAll() { - return tipRepository.findAll(); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/VozacServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/VozacServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,46 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Administrator; -import project.truckio.model.Vozac; -import project.truckio.model.Vraboten; -import project.truckio.repository.AdministratorRepository; -import project.truckio.repository.VozacRepository; -import project.truckio.repository.VrabotenRepository; -import project.truckio.service.VozacService; - -import java.util.List; -import java.util.Optional; - -@Service -public class VozacServiceImpl implements VozacService { - - private final VozacRepository vozacRepository; - private final VrabotenRepository vrabotenRepository; - - public VozacServiceImpl(VozacRepository vozacRepository, VrabotenRepository vrabotenRepository) { - this.vozacRepository = vozacRepository; - this.vrabotenRepository = vrabotenRepository; - } - - @Override - public Vozac registerVozac(Integer vrabotenId) { - Vraboten vraboten = vrabotenRepository.findById(vrabotenId).get(); - return vozacRepository.save(new Vozac(vraboten)); - } - - @Override - public Vozac findById(Integer vozacId) { - return vozacRepository.findById(vozacId).get(); - } - - @Override - public List findAll() { - return vozacRepository.findAll(); - } - - @Override - public Optional findRole(Integer vozacId) { - return vozacRepository.findById(vozacId); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/VoziloServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/VoziloServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,55 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Kompanija; -import project.truckio.model.Tip; -import project.truckio.model.Vozac; -import project.truckio.model.Vozilo; -import project.truckio.repository.KompanijaRepository; -import project.truckio.repository.TipRepository; -import project.truckio.repository.VozacRepository; -import project.truckio.repository.VoziloRepository; -import project.truckio.service.VoziloService; - -import java.util.List; -import java.util.Optional; - -@Service -public class VoziloServiceImpl implements VoziloService { - - private final VoziloRepository voziloRepository; - private final KompanijaRepository kompanijaRepository; - private final TipRepository tipRepository; - private final VozacRepository vozacRepository; - - public VoziloServiceImpl(VoziloRepository voziloRepository, KompanijaRepository kompanijaRepository, TipRepository tipRepository, VozacRepository vozacRepository) { - this.voziloRepository = voziloRepository; - this.kompanijaRepository = kompanijaRepository; - this.tipRepository = tipRepository; - this.vozacRepository = vozacRepository; - } - - @Override - public Vozilo registerVozilo(String vozilo_marka, Integer vozilo_kapacitet, Integer kompanijaId, Integer tipId, Integer vozacId) { - Kompanija kompanija = kompanijaRepository.findById(kompanijaId).get(); - Tip tip = tipRepository.findById(tipId).get(); - Vozac vozac = vozacRepository.findById(vozacId).get(); - Vozilo vozilo = new Vozilo(vozilo_marka, vozilo_kapacitet, kompanija, tip, vozac); - return voziloRepository.save(vozilo); - } - - @Override - public Optional findById(Integer voziloId) { - return voziloRepository.findById(voziloId); - } - - @Override - public List findAll() { - return voziloRepository.findAll(); - } - - @Override - public List findAllByCompany(Integer kompanijaId) { - return voziloRepository.findAllByCompany(kompanijaId); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/VrabotenServiceImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/VrabotenServiceImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,53 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Klient; -import project.truckio.model.Kompanija; -import project.truckio.model.Vraboten; -import project.truckio.model.exceptions.InvalidArgumentException; -import project.truckio.model.exceptions.InvalidUserCredentialsException; -import project.truckio.model.exceptions.InvalidUsernameOrPasswordException; -import project.truckio.model.passwordencrypt.CryptWithMD5; -import project.truckio.repository.KompanijaRepository; -import project.truckio.repository.VrabotenRepository; -import project.truckio.service.VrabotenService; - -import java.util.List; -import java.util.Optional; - -@Service -public class VrabotenServiceImpl implements VrabotenService { - - private final VrabotenRepository vrabotenRepository; - private final KompanijaRepository kompanijaRepository; - - public VrabotenServiceImpl(VrabotenRepository vrabotenRepository, KompanijaRepository kompanijaRepository) { - this.vrabotenRepository = vrabotenRepository; - this.kompanijaRepository = kompanijaRepository; - } - - @Override - public Vraboten registerVraboten(String vraboten_ime, String vraboten_prezime, String vraboten_email, String vraboten_password, Integer kompanija_id) { - Kompanija vraboten_kompanija = kompanijaRepository.findById(kompanija_id).get(); - Vraboten vraboten = new Vraboten(vraboten_ime, vraboten_prezime, vraboten_email, vraboten_password, vraboten_kompanija); - return vrabotenRepository.save(vraboten); - } - - @Override - public Optional findById(Integer vrabotenId) { - return vrabotenRepository.findById(vrabotenId); - } - - @Override - public List listAll() { - return vrabotenRepository.findAll(); - } - - @Override - public Vraboten login(String email, String password) { - if(email == null || email.isEmpty() || password==null || password.isEmpty()) { - throw new InvalidArgumentException(); - } - return vrabotenRepository.findByEmailAndPassword(email, CryptWithMD5.cryptWithMD5(password)).orElseThrow(InvalidUsernameOrPasswordException::new); - } -} Index: uckIO/truckio/src/main/java/project/truckio/service/impl/VrabotenTelefoniImpl.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/service/impl/VrabotenTelefoniImpl.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,43 +1,0 @@ -package project.truckio.service.impl; - -import org.springframework.stereotype.Service; -import project.truckio.model.Vraboten; -import project.truckio.model.VrabotenTelefoni; -import project.truckio.model.primarykeys.VrabotenTelefoniID; -import project.truckio.repository.VrabotenRepository; -import project.truckio.repository.VrabotenTelefoniRepository; -import project.truckio.service.VrabotenTelefoniService; - -import java.util.List; - -@Service -public class VrabotenTelefoniImpl implements VrabotenTelefoniService { - - private final VrabotenRepository vrabotenRepository; - private final VrabotenTelefoniRepository vrabotenTelefoniRepository; - - public VrabotenTelefoniImpl(VrabotenRepository vrabotenRepository, VrabotenTelefoniRepository vrabotenTelefoniRepository) { - this.vrabotenRepository = vrabotenRepository; - this.vrabotenTelefoniRepository = vrabotenTelefoniRepository; - } - - @Override - public VrabotenTelefoni addVrabotenTelefon(Integer vrabotenId, String telefon) { - Vraboten vraboten = vrabotenRepository.findById(vrabotenId).get(); - VrabotenTelefoniID vrabotenTelefoniID = new VrabotenTelefoniID(vrabotenId, telefon); - - VrabotenTelefoni vrabotenTelefoni = new VrabotenTelefoni(vrabotenTelefoniID, vraboten); - return vrabotenTelefoniRepository.save(vrabotenTelefoni); - } - - @Override - public List findAll() { - return vrabotenTelefoniRepository.findAll(); - } - - @Override - public List findAllByVraboten(Integer vrabotenId) { - Vraboten vraboten = vrabotenRepository.findById(vrabotenId).get(); - return vrabotenTelefoniRepository.findAllByVraboten(vraboten); - } -} Index: uckIO/truckio/src/main/java/project/truckio/web/AdministratorController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/AdministratorController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,186 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import project.truckio.model.*; -import project.truckio.service.*; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - -@Controller -public class AdministratorController { - - private final RutaService rutaService; - private final GradService gradService; - private final VoziloService voziloService; - private final DispecerService dispecerService; - private final RezervacijaService rezervacijaService; - private final FakturaService fakturaService; - private final RobaService robaService; - - - public AdministratorController(RutaService rutaService, GradService gradService, VoziloService voziloService, DispecerService dispecerService, RezervacijaService rezervacijaService, AdministratorService administratorService, FakturaService fakturaService, RobaService robaService) { - this.rutaService = rutaService; - this.gradService = gradService; - this.voziloService = voziloService; - this.dispecerService = dispecerService; - this.rezervacijaService = rezervacijaService; - this.fakturaService = fakturaService; - this.robaService = robaService; - } - - @GetMapping({"/companyRoutes"}) - public String getCompanyRoutes(HttpServletRequest request, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - Kompanija kompanija = (Kompanija) request.getSession().getAttribute("kompanija"); - List ruti = this.rutaService.findAllByCompany(kompanija.getKompanija_id()); - model.addAttribute("ruti", ruti); - - return "listCompanyRoutes.html"; - } - - // ADD NEW ROUTE - @GetMapping({"/addRoute"}) - public String getAddRoutePage(HttpServletRequest request, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - Kompanija kompanija = (Kompanija) request.getSession().getAttribute("kompanija"); - List vozila = this.voziloService.findAllByCompany(kompanija.getKompanija_id()); - List dispeceri = this.dispecerService.findAllByCompany(kompanija.getKompanija_id()); - List gradovi = this.gradService.findAll(); - - model.addAttribute("gradovi", gradovi); - model.addAttribute("vozila", vozila); - model.addAttribute("dispeceri", dispeceri); - - return "addRoute.html"; - } - - @PostMapping({"/addRoute"}) - public String addRuta(HttpServletRequest request, - @RequestParam Integer zapocnuva_vo, - @RequestParam Integer zavrsuva_vo, - @RequestParam String datum_trgnuvanje, - @RequestParam String datum_pristignuvanje, - @RequestParam Integer dispecer, - @RequestParam Integer vozilo_id, - Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate trgnuva = LocalDate.parse(datum_trgnuvanje, formatter); - LocalDate pristignuva = LocalDate.parse(datum_pristignuvanje, formatter); - - if(trgnuva.isAfter(pristignuva)){ - model.addAttribute("hasError", true); - model.addAttribute("error", "trgnuvaIsAfterPristignuva"); - return "addRoute.html"; - } - - if(trgnuva.isBefore(LocalDate.now())){ - model.addAttribute("hasError", true); - model.addAttribute("error", "trgnuvaIsBeforeToday"); - return "addRoute.html"; - } - - Vozilo vozilo = voziloService.findById(vozilo_id).get(); - this.rutaService.addRuta(trgnuva, pristignuva, zapocnuva_vo, zavrsuva_vo, vozilo_id, dispecer, vozilo.getVozac().getVozac_id()); - return "redirect:/companyRoutes"; - } - - - // RESERVATION TO CONFIRM - @GetMapping({"/reservationsToConfirm"}) - public String getReservationsToConfirmPage(HttpServletRequest request, Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - Kompanija kompanija = (Kompanija) request.getSession().getAttribute("kompanija"); - List rezervacii = rezervacijaService.finAllRezervaciiByCompany(kompanija.getKompanija_id()); - - model.addAttribute("rezervacii", rezervacii); - - return "reservationsToConfirm.html"; - } - - @GetMapping({"/reservationsToConfirm/{id}"}) - public String getReservationToConfirmPage(HttpServletRequest request, - @RequestParam(required = false) String error, - @PathVariable String id, Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - Kompanija kompanija = (Kompanija) request.getSession().getAttribute("kompanija"); - Rezervacija rezervacija = rezervacijaService.findById(Integer.valueOf(id)); - List robaList = robaService.findRobaForReservation(Integer.valueOf(id)); - - model.addAttribute("rezervacija", rezervacija); - model.addAttribute("robaList", robaList); - - return "reservationToConfirmDetails.html"; - } - - @PostMapping({"/setActive"}) - public String setActive(HttpServletRequest request, - @RequestParam Integer rezervacija_id, - @RequestParam(required = false) Integer iznos, - @RequestParam String status, - Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - Rezervacija rezervacija = rezervacijaService.findById(rezervacija_id); - - if(status.equals("откажана")) { - rezervacijaService.updateStatus(rezervacija, "Откажана"); - return "redirect:/reservationsToConfirm"; - } - - if(status.equals("активна") && iznos == null) { - List robaList = robaService.findRobaForReservation(Integer.valueOf(rezervacija_id)); - - model.addAttribute("rezervacija", rezervacija); - model.addAttribute("robaList", robaList); - - model.addAttribute("hasError", true); - return "reservationToConfirmDetails.html"; - } - - rezervacijaService.updateStatus(rezervacija, "Активна"); - - Vraboten vraboten = (Vraboten) request.getSession().getAttribute("vraboten"); - fakturaService.addFaktura(iznos, rezervacija_id, vraboten.getVraboten_id()); - - return "redirect:/reservationsToConfirm"; - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/DispatcherController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/DispatcherController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,78 +1,0 @@ -package project.truckio.web; - - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import project.truckio.model.Rezervacija; -import project.truckio.model.Roba; -import project.truckio.model.Vraboten; -import project.truckio.service.RezervacijaService; -import project.truckio.service.RobaService; -import project.truckio.service.RutaService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Controller -@RequestMapping("/dispatcher") -public class DispatcherController { - - private final RutaService rutaService; - private final RezervacijaService rezervacijaService; - private final RobaService robaService; - - public DispatcherController(RutaService rutaService, RezervacijaService rezervacijaService, RobaService robaService) { - this.rutaService = rutaService; - this.rezervacijaService = rezervacijaService; - this.robaService = robaService; - } - - @GetMapping("/activeRoutes") - public String getActiveRoutesPage(HttpServletRequest request, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("dispecer")) { - return "redirect:/notAuthorized"; - } - - Vraboten vraboten = (Vraboten) request.getSession().getAttribute("vraboten"); - Integer vraboten_id = vraboten.getVraboten_id(); - - model.addAttribute("ruti", this.rutaService.findAllActiveByDispecer(vraboten_id)); - - return "dispatcherRoutes.html"; - } - - @GetMapping("/details/{id}") - public String getRouteDetailsPage(HttpServletRequest request, @PathVariable String id, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("dispecer")) { - return "redirect:/notAuthorized"; - } - - Rezervacija rezervacija = this.rezervacijaService.findByRuta(Integer.parseInt(id)).get(0); - List robaList = robaService.findRobaForReservation(Integer.valueOf(rezervacija.getRezervacija_id())); - - model.addAttribute("rezervacija", rezervacija); - model.addAttribute("robaList", robaList); - - return "dispatcherReservationDetails.html"; - } - - @PostMapping("/finishedReservation") - public String setFinishedReservation(HttpServletRequest request, @RequestParam String rezervacija_id){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("dispecer")) { - return "redirect:/notAuthorized"; - } - - Rezervacija rezervacija = this.rezervacijaService.findById(Integer.parseInt(rezervacija_id)); - rezervacijaService.updateStatus(rezervacija, "Завршена"); - return "redirect:/dispatcher/activeRoutes"; - - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/DriverController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/DriverController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,70 +1,0 @@ -package project.truckio.web; - - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import project.truckio.model.Rezervacija; -import project.truckio.model.Roba; -import project.truckio.model.Vraboten; -import project.truckio.service.RezervacijaService; -import project.truckio.service.RobaService; -import project.truckio.service.RutaService; - -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; - -@Controller -@RequestMapping("/driver") -public class DriverController { - - private final RutaService rutaService; - private final RezervacijaService rezervacijaService; - private final RobaService robaService; - - public DriverController(RutaService rutaService, RezervacijaService rezervacijaService, RobaService robaService) { - this.rutaService = rutaService; - this.rezervacijaService = rezervacijaService; - this.robaService = robaService; - } - - @GetMapping("/active-routes") - public String getActiveRoutesPage(HttpServletRequest request, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("vozac")) { - return "redirect:/notAuthorized"; - } - - Vraboten vraboten = (Vraboten) request.getSession().getAttribute("vraboten"); - Integer vraboten_id = vraboten.getVraboten_id(); - - model.addAttribute("ruti", this.rutaService.findAllActiveByVozac(vraboten_id)); - - return "driverRoutes.html"; - } - - @GetMapping("/route-details/{id}") - public String getActiveRouteDetailsPage(HttpServletRequest request, @PathVariable String id, Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("vozac")) { - return "redirect:/notAuthorized"; - } - - Integer rutaId = Integer.parseInt(id); - Rezervacija rezervacija = this.rezervacijaService.findByRuta(rutaId).get(0); - - List robaList = this.robaService.findRobaForReservation(rezervacija.getRezervacija_id()); - - model.addAttribute("roba", robaList); - model.addAttribute("ruta", this.rutaService.findById(rutaId)); - model.addAttribute("robaList", robaList); - - return "driverRouteDetails.html"; - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/HomeController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/HomeController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,42 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import project.truckio.model.Kompanija; -import project.truckio.model.Vraboten; -import project.truckio.model.passwordencrypt.CryptWithMD5; -import project.truckio.service.AdministratorService; -import project.truckio.service.KompanijaService; -import project.truckio.service.VrabotenService; - -import java.util.List; - -@Controller -public class HomeController { - private final VrabotenService vrabotenService; - - private final KompanijaService kompanijaService; - - public HomeController(VrabotenService vrabotenService, KompanijaService kompanijaService) { - this.vrabotenService = vrabotenService; - this.kompanijaService = kompanijaService; - } - - @GetMapping({"/", "/home"}) - public String showHomePage(@RequestParam(required = false) String error, Model model) { - - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - - List kompanii = kompanijaService.listAll(); - model.addAttribute("kompanii", kompanii); - return "home.html"; - - } - - -} Index: uckIO/truckio/src/main/java/project/truckio/web/IzvestajController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/IzvestajController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,65 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import project.truckio.model.*; -import project.truckio.service.IzvestajService; -import project.truckio.service.KompaniiKlientiService; -import project.truckio.service.KompaniiRutiService; -import project.truckio.service.RelacijaRezervaciiService; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Controller -public class IzvestajController { - - private final IzvestajService izvestajService; - private final KompaniiKlientiService kompaniiKlientiService; - private final RelacijaRezervaciiService relacijaRezervaciiService; - private final KompaniiRutiService kompaniiRutiService; - - public IzvestajController(IzvestajService izvestajService, KompaniiKlientiService kompaniiKlientiService, RelacijaRezervaciiService relacijaRezervaciiService, KompaniiRutiService kompaniiRutiService) { - this.izvestajService = izvestajService; - this.kompaniiKlientiService = kompaniiKlientiService; - this.relacijaRezervaciiService = relacijaRezervaciiService; - this.kompaniiRutiService = kompaniiRutiService; - } - - @GetMapping({"/izvestaj"}) - public String showHomePage(HttpServletRequest request, @RequestParam(required = false) String error, Model model) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("administrator")) { - return "redirect:/notAuthorized"; - } - - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - - Kompanija kompanija = (Kompanija) request.getSession().getAttribute("kompanija"); - - // generalen izvestaj - Izvestaj generalenIzvestaj = izvestajService.findById(kompanija.getKompanija_id()); - model.addAttribute("generalenIzvestaj", generalenIzvestaj); - - // kompanii-klienti izvestaj - List kompaniiKlientiIzvestaj = kompaniiKlientiService.findByCompanyId(kompanija.getKompanija_id()); - model.addAttribute("kompaniiKlientiIzvestaj", kompaniiKlientiIzvestaj); - - // relacija-rezervacii izvestaj - List relacijaRezervaciiIzvestaj = relacijaRezervaciiService.findByCompanyId(kompanija.getKompanija_id()); - model.addAttribute("relacijaRezervaciiIzvestaj", relacijaRezervaciiIzvestaj); - - // relacija-ruti izvestaj - List kompaniiRutiIzvestaj = kompaniiRutiService.findByCompanyId(kompanija.getKompanija_id()); - model.addAttribute("kompaniiRutiIzvestaj", kompaniiRutiIzvestaj); - - return "izvestaj.html"; - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/LoginController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/LoginController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,84 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import project.truckio.model.*; -import project.truckio.model.exceptions.InvalidUserCredentialsException; -import project.truckio.model.exceptions.InvalidUsernameOrPasswordException; -import project.truckio.service.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.Optional; - -@Controller -@RequestMapping("/login") -public class LoginController { - - private final KlientService klientService; - private final VrabotenService vrabotenService; - private final AdministratorService administratorService; - private final DispecerService dispecerService; - private final VozacService vozacService; - - public LoginController(KlientService klientService, VrabotenService vrabotenService, AdministratorService administratorService, DispecerService dispecerService, VozacService vozacService) { - this.klientService = klientService; - this.vrabotenService = vrabotenService; - this.administratorService = administratorService; - this.dispecerService = dispecerService; - this.vozacService = vozacService; - } - - @GetMapping - public String getLoginClientPage(Model model) { - return "login.html"; - } - - @PostMapping - public String login(HttpServletRequest request, Model model) { - Klient klient = null; - Vraboten vraboten = null; - Optional administrator = null; - Optional dispecer = null; - Optional vozac = null; - request.getSession().setAttribute("role", "none"); - - try{ - if(request.getParameter("role").equals("client")) { - klient = this.klientService.login(request.getParameter("email"), request.getParameter("password")); - request.getSession().setAttribute("klient", klient); - request.getSession().setAttribute("role", "klient"); - return "redirect:/routes"; - } - - vraboten = this.vrabotenService.login(request.getParameter("email"), request.getParameter("password")); - request.getSession().setAttribute("vraboten", vraboten); - request.getSession().setAttribute("kompanija", vraboten.getKompanija()); - - // save employee role in session - administrator = this.administratorService.findRole(vraboten.getVraboten_id()); - dispecer = this.dispecerService.findRole(vraboten.getVraboten_id()); - vozac = this.vozacService.findRole(vraboten.getVraboten_id()); - - if(!administrator.isEmpty()) { - request.getSession().setAttribute("role", "administrator"); - return "redirect:/companyRoutes"; - } else if(!dispecer.isEmpty()) { - request.getSession().setAttribute("role", "dispecer"); - return "redirect:/dispatcher/activeRoutes"; - } else if(!vozac.isEmpty()) { - request.getSession().setAttribute("role", "vozac"); - return "redirect:/driver/active-routes"; - } - - return "redirect:/home"; - - } catch (InvalidUsernameOrPasswordException exception) { - model.addAttribute("hasError", true); - model.addAttribute("error", exception.getMessage()); - return "login.html"; - } - } -} Index: uckIO/truckio/src/main/java/project/truckio/web/LogoutController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/LogoutController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,19 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/logout") -public class LogoutController { - - @GetMapping - public String logout(HttpServletRequest request) { - request.getSession().invalidate(); - return "redirect:/login"; - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/NotAuthorizedController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/NotAuthorizedController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,20 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -public class NotAuthorizedController { - @GetMapping({"/notAuthorized"}) - public String showPage(@RequestParam(required = false) String error, Model model) { - - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - - return "notAuthorized.html"; - } -} Index: uckIO/truckio/src/main/java/project/truckio/web/RegisterController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/RegisterController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,60 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import project.truckio.model.exceptions.InvalidArgumentException; -import project.truckio.model.exceptions.PasswordsDoNotMatch; -import project.truckio.service.KlientService; - -@Controller -@RequestMapping("/register") -public class RegisterController { - private final KlientService klientService; - - public RegisterController(KlientService klientService) { - this.klientService = klientService; - } - - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) { - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - return "register.html"; - } - - @PostMapping - public String register(@RequestParam String ime, - @RequestParam String prezime, - @RequestParam String password, - @RequestParam String repeatedPassword, - @RequestParam String email, - @RequestParam String telefon, - Model model) { - - if(!email.contains("@") && !email.contains("@")) { - model.addAttribute("hasError", true); - model.addAttribute("error", "emailError"); - return "register.html"; - } - - if(telefon.length()!=9 && telefon.startsWith("07")) { - model.addAttribute("hasError", true); - model.addAttribute("error", "telefonError"); - return "register.html"; - } - - try { - this.klientService.register(ime, prezime, password, repeatedPassword, email, telefon); - return "redirect:/login"; - } catch (PasswordsDoNotMatch | InvalidArgumentException exception) { - return "redirect:/register?error=" + exception.getMessage(); - } - } - -} Index: uckIO/truckio/src/main/java/project/truckio/web/ReservationController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/ReservationController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,120 +1,0 @@ -package project.truckio.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import project.truckio.model.*; -import project.truckio.service.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Controller -@RequestMapping("/reservations") -public class ReservationController { - - private final KategorijaService kategorijaService; - private final RezervacijaService rezervacijaService; - private final RobaService robaService; - private final RutaService rutaService; - private final FakturaService fakturaService; - - - public ReservationController(KategorijaService kategorijaService, RezervacijaService rezervacijaService, RobaService robaService, RutaService rutaService, FakturaService fakturaService) { - this.kategorijaService = kategorijaService; - this.rezervacijaService = rezervacijaService; - this.robaService = robaService; - this.rutaService = rutaService; - this.fakturaService = fakturaService; - } - - @PostMapping - public String createReservation(HttpServletRequest request, Model model, - @RequestParam String ruta_id, - @RequestParam(value="kategorija[]", required = false) String[] kategorii, - @RequestParam(value="kolicina[]", required = false) String[] kolicini) { - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("klient")) { - return "redirect:/notAuthorized"; - } - - if(kategorii == null) { - return "redirect:/routes/details/" + ruta_id + "/?error=noCategorySelectedError"; - } - - // dodaj rezervacija - Klient klient = (Klient) request.getSession().getAttribute("klient"); - - Ruta ruta = rutaService.findById(Integer.valueOf(ruta_id)); - Vozilo vozilo = ruta.getVozilo(); - - int vkupnoKolicini = 0; - for(int i=0; i rezervacii = rezervacijaService.findReservationsForRoute(Integer.valueOf(ruta_id)); - for(Rezervacija r : rezervacii) { - List robaList = robaService.findRobaForReservation(r.getRezervacija_id()); - for(Roba roba : robaList) { - vkupnoIskoristeno += roba.getRoba_kolicina(); - } - } - - // ako ima kapacitet dodadi i prenasoci na moi rezervacii - if(vozilo.getVozilo_kapacitet() - vkupnoIskoristeno >= vkupnoKolicini) { - Rezervacija rezervacija = rezervacijaService.addRezervacija("За одобрување", klient.getKlient_id(), Integer.valueOf(ruta_id)); - // roba za rezervacijata - for(int i=0; i rezervacii = this.rezervacijaService.findMyReservations(klient.getKlient_id()); - model.addAttribute("rezervacii", rezervacii); - - return "myReservations.html"; - } - - @GetMapping("/details/{rezervacija_id}") - public String getReservationDetails(@PathVariable String rezervacija_id, HttpServletRequest request, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("klient")) { - return "redirect:/notAuthorized"; - } - - Klient klient = (Klient) request.getSession().getAttribute("klient"); - Rezervacija rezervacija = rezervacijaService.findById(Integer.valueOf(rezervacija_id)); - List robaList = robaService.findRobaForReservation(Integer.valueOf(rezervacija_id)); - - String status = rezervacija.getRezervacija_status().toLowerCase(); - - if(status.equals("активна") || status.equals("завршена")) { - Faktura faktura = fakturaService.findFakturaByRezervacija(rezervacija); - model.addAttribute("faktura", faktura); - } - - model.addAttribute("rezervacija", rezervacija); - model.addAttribute("robaList", robaList); - - return "reservationDetails.html"; - } -} Index: uckIO/truckio/src/main/java/project/truckio/web/RoutesController.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/RoutesController.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,95 +1,0 @@ -package project.truckio.web; - - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import project.truckio.model.*; -import project.truckio.service.KategorijaService; -import project.truckio.service.RezervacijaService; -import project.truckio.service.RobaService; -import project.truckio.service.RutaService; - -import javax.servlet.http.HttpServletRequest; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - -@Controller -@RequestMapping("/routes") - -public class RoutesController { - - private final RutaService rutaService; - private final KategorijaService kategorijaService; - private final RezervacijaService rezervacijaService; - private final RobaService robaService; - - public RoutesController(RutaService rutaService, KategorijaService kategorijaService, RezervacijaService rezervacijaService, RobaService robaService) { - this.rutaService = rutaService; - this.kategorijaService = kategorijaService; - this.rezervacijaService = rezervacijaService; - this.robaService = robaService; - } - - @GetMapping - public String getAvailableRoutes(HttpServletRequest request, Model model, - @RequestParam (required = false) String dateFrom, - @RequestParam (required = false) String dateTo){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("klient")) { - return "redirect:/notAuthorized"; - } - - List ruti = this.rutaService.findAllAvailable(); - if(dateFrom != null && dateTo != null) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate trgnuva = LocalDate.parse(dateFrom, formatter); - LocalDate pristignuva = LocalDate.parse(dateTo, formatter); - - ruti = this.rutaService.findAllInDateInterval(trgnuva, pristignuva); - } - - model.addAttribute("ruti", ruti); - - return "listRoutes.html"; - } - - @GetMapping("/details/{id}") - public String getRouteDetails(HttpServletRequest request, - @RequestParam(required = false) String error, - @PathVariable String id, Model model){ - - String role = (String) request.getSession().getAttribute("role"); - if(!role.equals("klient")) { - return "redirect:/notAuthorized"; - } - - if(error != null && !error.isEmpty()) { - model.addAttribute("hasError", true); - model.addAttribute("error", error); - } - - List kategorii = this.kategorijaService.findAll(); - Ruta ruta = this.rutaService.findById(Integer.parseInt(id)); - - // site rezervacii od ruta, site roba od rezervacija - int vkupnoIskoristeno = 0; - List rezervacii = rezervacijaService.findReservationsForRoute(Integer.valueOf(id)); - for(Rezervacija r : rezervacii) { - List robaList = robaService.findRobaForReservation(r.getRezervacija_id()); - for(Roba roba : robaList) { - vkupnoIskoristeno += roba.getRoba_kolicina(); - } - } - model.addAttribute("preostanatKapacitet", ruta.getVozilo().getVozilo_kapacitet()-vkupnoIskoristeno); - model.addAttribute("kategorii", kategorii); - model.addAttribute("ruta", ruta); - - return "routeDetails.html"; - } - - - -} Index: uckIO/truckio/src/main/java/project/truckio/web/filter/LoginFilter.java =================================================================== --- TruckIO/truckio/src/main/java/project/truckio/web/filter/LoginFilter.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,45 +1,0 @@ -package project.truckio.web.filter; - -import org.springframework.context.annotation.Profile; -import project.truckio.model.Klient; -import project.truckio.model.Vraboten; - -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@WebFilter -public class LoginFilter implements Filter { - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - Filter.super.init(filterConfig); - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; - - Klient klient = (Klient) request.getSession().getAttribute("klient"); - Vraboten vraboten = (Vraboten) request.getSession().getAttribute("vraboten"); - - String path = request.getServletPath(); - - if( !path.equals("/") && !path.equals("/home") && !path.equals("/login") && !path.equals("/register") && - !path.startsWith("/webjars/") && !path.startsWith("/img/") && !path.startsWith("/css/style.css") && - (klient==null && vraboten==null)) { - response.sendRedirect("/login"); - } else { - filterChain.doFilter(servletRequest, servletResponse); - } - } - - @Override - public void destroy() { - Filter.super.destroy(); - } -} Index: uckIO/truckio/src/main/resources/application.properties =================================================================== --- TruckIO/truckio/src/main/resources/application.properties (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,11 +1,0 @@ -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://localhost:9999/db_202223z_va_prj_truckio -spring.datasource.username=db_202223z_va_prj_truckio_owner -spring.datasource.password=b3b6bd765282 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect -spring.jpa.hibernate.ddl-auto=validate -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.format_sql=true - -spring.mvc.hiddenmethod.filter.enabled=true -spring.jpa.properties.hibernate.globally_quoted_identifiers=true Index: uckIO/truckio/src/main/resources/static/css/style.css =================================================================== --- TruckIO/truckio/src/main/resources/static/css/style.css (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,826 +1,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700;800&display=swap'); - -/* COLORS */ -:root { - --primary-red: #D84F55; - --secondary-red: #c23b41; -} - -body{ - font-family: 'Poppins', sans-serif; -} -.show { - display: block; -} -.hide { - display: none; -} - -/* BUTTON STATIC STYLE */ -.btn-primary { - background: var(--primary-red); - border: var(--primary-red); -} -.btn-primary:hover { - background: var(--secondary-red); - border: var(--secondary-red); -} - -.btn-primary:not(:disabled):not(.disabled):active { - background: var(--secondary-red); - border-color: var(--secondary-red); -} - -.btn-secondary { - background: #ffffff; - border: 2px solid; - border-color: var(--primary-red); - color: var(--primary-red)!important; -} -.btn-secondary:hover { - background: #fff; - border: 2px solid; - border-color: var(--secondary-red); - color: var(--secondary-red)!important; -} - - -/* NAVBAR */ -.navbar { - padding: 10px 0; -} -.navbar img { - width: 150px; -} -.navbar .nav-item { - padding: 0px 15px; -} -.navbar .nav-item .nav-link { - color: #222222; -} -.navbar .nav-button { - background: var(--primary-red); - border-radius: 5px; - color: #fff; -} -.navbar .nav-button:hover { - background: var(--secondary-red); - cursor: pointer; -} -.navbar .nav-button .nav-link { - color: white; -} -.navbar .nav-link:hover { - text-decoration: none; -} - -/* HOME */ -.home .home-main { - background: url("../img/main-backgound.svg") bottom no-repeat; - background-size: contain; - padding: 100px 0 200px 0; -} -.home .home-main h3 { - text-align: center; - font-weight: bold; - color: #222222; -} -.home .stats h3 { - text-align: center; - color: var(--primary-red); - font-size: 40px; - margin: 0; - font-weight: bold; -} -.home .stats { - padding: 50px 0; -} -.home .stats p { - text-align: center; - color: #222222; - font-size: 20px; - font-weight: bold; -} -.home .callToAction { - background: #efefef; - padding: 100px 0; -} -.home .callToAction h3 { - color: var(--primary-red); - font-weight: bold; - margin-bottom: 5px; -} -.home .callToAction p { - color: #222222; - font-size: 18px; - line-height: 1; - margin: 0; -} -.home .callToAction .col-md-4 { - display: flex; - justify-content: center; - align-items: center; -} -.home .callToAction .cta-button { - margin: auto; - background: var(--primary-red); - color: white; - padding: 15px 100px; - border-radius: 5px; - font-size: 18px; - font-weight: bold; -} -.home .companies { - padding: 100px 0; -} -.home .companies h3 { - text-align: center; - font-weight: bold; - color: #222222; - margin-bottom: 20px; -} -.home .companies .logos { - width: 40%; - margin: auto; -} -.home .companies .col-md-4, .home .companies .col-md-6 { - text-align: center; -} -.home .companies img { - text-align: center; - width: 120px; -} - -/* LOGIN */ -.login { - background: url("../img/main-backgound.svg") bottom no-repeat; - background-size: contain; - padding: 50px 0 300px 0; -} -.login h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.login .form-box { - width: 60%; - margin: auto; -} -.login .form-box p { - color: #A3A3A3; - margin-bottom: 0; -} -.login .form-box a { - color: var(--primary-red); - font-weight: bold; -} -.login .form-box a:hover { - color: var(--secondary-red); - text-decoration: underline; -} -.login .form-box .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0 0 10px 0; - height: 50px; - border-radius: 5px; - border: none; -} -.login .form-box .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} - -/* REGISTER */ -.register { - background: url("../img/main-backgound.svg") bottom no-repeat; - background-size: contain; - padding: 50px 0 300px 0; -} -.register h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.register .form-box { - width: 60%; - margin: auto; -} -.register .form-box p { - color: #A3A3A3; - margin-bottom: 0; -} -.register .form-box a { - color: var(--primary-red); - font-weight: bold; -} -.register .form-box a:hover { - color: var(--secondary-red); - text-decoration: underline; -} -.register .form-box .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0px 0px 10px 0px; - height: 50px; - border-radius: 5px; - border: none; -} -.register .form-box .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} -.register .form-box .row .col-md-6:nth-of-type(2n) { - padding-left: 5px; -} -.register .form-box .row .col-md-6:nth-of-type(2n+1) { - padding-right: 5px; -} - -/* ROUTES */ -.routes { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.routes h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.routes .route-box { - padding: 25px 20px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.routes .route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.routes h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.routes .route-box img { - width: 50%; -} -.routes .btn-primary { - padding: 10px 20px; -} -.routes .route-box .col-md-2, .routes .route-box .col-md-1 { - display: flex; - justify-content: center; - align-items: center; -} - -/* ROUTE-DETAILS for klient */ -.route-details { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.route-details h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.route-details .route-box { - padding: 50px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.route-details .route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.route-details h4 { - color: #222222; - font-size: 20px; -} -.route-details .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0 0 10px 0; - height: 50px; - border-radius: 5px; - border: none; -} -.route-details .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} -.route-details .btn-secondary { - border-color: #C2C1C1; - color: #222222!important; - width: 50%; -} -.route-details .btn-secondary:hover { - border-color: var(--primary-red); - cursor: pointer; -} -.route-details .btn-secondary:not(:disabled):not(.disabled):active { - background: #ffffff; - border-color: var(--primary-red); -} -.route-details #entries { - margin-top: 20px; -} -.route-details #entries .remove-entry { - width: 100%; - min-height: 50px; - display: flex; - justify-content: center; - align-items: center; - color: #C2C1C1; - font-weight: bold; - font-size: 25px; -} -.route-details #entries .remove-entry:hover { - color: var(--primary-red); - cursor: pointer; -} - -/* MY RESERVATIONS for klient */ -.reservations { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.reservations h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.reservations .reservation-box { - padding: 50px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.reservations .reservation-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.reservations h4 { - color: #222222; - font-size: 20px; - margin-bottom: 20px; -} -.reservations .reservation-box { - padding: 25px 20px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.reservations .reservation-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.reservations h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.reservations .btn-primary { - padding: 10px 20px; -} -.reservations .reservation-box .col-md-2 { - display: flex; - justify-content: start; - align-items: center; -} - - -/* COMPANY-ROUTES for administrator */ -.company-routes { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.company-routes h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.company-routes .route-box { - padding: 25px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.company-routes .route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.company-routes h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.company-routes .btn-primary { - padding: 10px 20px; -} -.company-routes .route-box .col-md-3{ - margin: 10px 0; -} - -/* ADD-ROUTE for administrator */ -.add-route { - background: url("../img/main-backgound.svg") bottom no-repeat; - background-size: contain; - padding: 50px 0 300px 0; -} -.add-route h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.add-route .form-box { - width: 60%; - margin: auto; -} -.add-route .form-box p { - color: #A3A3A3; - margin-bottom: 0; -} -.add-route .form-box .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0px 0px 10px 0px; - height: 50px; - border-radius: 5px; - border: none; -} -.add-route .form-box .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} -.add-route .form-box .row .col-md-6:nth-of-type(2n) { - padding-left: 5px; -} -.add-route .form-box .row .col-md-6:nth-of-type(2n+1) { - padding-right: 5px; -} - -/* RESERVATIONS_TO_CONFIRM for administrator */ -.reservations-to-confirm { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.reservations-to-confirm h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.reservations-to-confirm .reservation-box { - padding: 25px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.reservations-to-confirm .reservation-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.reservations-to-confirm h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.reservations-to-confirm .btn-primary { - padding: 10px 20px; -} -.reservations-to-confirm .reservation-box .col-md-3{ - margin: 10px 0; -} -.reservations-to-confirm .reservation-box .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0 0 10px 0; - height: 50px; - border-radius: 5px; - border: none; -} -.reservations-to-confirm .reservation-box .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} - -/* RESERVATION TO CONFIRM */ -.reservation-to-confirm { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.reservation-to-confirm h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.reservation-to-confirm .reservation-box { - padding: 25px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.reservation-to-confirm .reservation-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.reservation-to-confirm h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.reservation-to-confirm .btn-primary { - padding: 10px 20px; -} -.reservation-to-confirm .reservation-box .col-md-6, -.reservation-to-confirm .reservation-box .col-md-12{ - margin: 10px 0; -} -.reservation-to-confirm .reservation-box .form-control { - background: #F6F6F6; - padding: 15px; - margin: 0 0 10px 0; - height: 50px; - border-radius: 5px; - border: none; -} -.reservation-to-confirm .reservation-box .form-control:focus { - color: #495057; - background-color: #F6F6F6; - border-color: var(--primary-red); - outline: 0; - box-shadow: 0 0 2px 0.1rem rgb(216 79 85 / 10%); -} - -/* IZVESTAJ */ -.izvestaj { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.izvestaj .container { - margin-bottom: 100px; -} -.izvestaj .container:last-of-type { - margin-bottom: 0px; -} -.izvestaj h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.izvestaj .izvestaj-box { - padding: 25px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.izvestaj .izvestaj-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.izvestaj h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.izvestaj .btn-primary { - padding: 10px 20px; -} -.izvestaj .izvestaj-box .col-md-3, .izvestaj .izvestaj-box .col-md-12, -.izvestaj .izvestaj-box .col-md-4, .izvestaj .izvestaj-box .col-md-2{ - margin: 10px 0; -} - -/* DISPATCHER-ROUTES */ -.dispatcher-routes { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.dispatcher-routes h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.dispatcher-routes .dispatcher-route-box { - padding: 25px 20px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.dispatcher-routes .dispatcher-route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.dispatcher-routes h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.dispatcher-routes .dispatcher-route-box img { - width: 50%; -} -.dispatcher-routes .btn-primary { - padding: 10px 20px; -} -.dispatcher-routes .dispatcher-route-box .col-md-2, .dispatcher-routes .dispatcher-route-box .col-md-1 { - display: flex; - justify-content: center; - align-items: center; -} - - -/* DISPATCHER-RESERVATION-DETAILS */ -.dispatcher-reservation-details { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.dispatcher-reservation-details h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.dispatcher-reservation-details .reservation-box { - padding: 25px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.dispatcher-reservation-details .reservation-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.dispatcher-reservation-details h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.dispatcher-reservation-details .btn-primary { - padding: 10px 20px; -} -.dispatcher-reservation-details .reservation-box .col-md-6, -.dispatcher-reservation-details .reservation-box .col-md-12{ - margin: 10px 0; -} - - -/* DRIVER-ROUTES */ -.driver-routes { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.driver-routes h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.driver-routes .driver-route-box { - padding: 25px 20px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.driver-routes .driver-route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.driver-routes h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.driver-routes .driver-route-box img { - width: 50%; -} -.driver-routes .btn-primary { - padding: 10px 20px; -} -.driver-routes .driver-route-box .col-md-2, .driver-routes .driver-route-box .col-md-1 { - display: flex; - justify-content: center; - align-items: center; -} - - -/* DRIVER-ROUTE-DETAILS */ -.driver-route-details { - padding: 100px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.driver-route-details h3 { - font-weight: bold; - color: #222222; - margin-bottom: 5px; -} -.driver-route-details .route-box { - padding: 25px 40px 50px 40px; - margin: 20px 0; - border-radius: 5px; - box-shadow: rgb(0 0 0 / 10%) 2px 2px 10px; -} -.driver-route-details .route-box p { - color: #A3A3A3; - margin-bottom: 0; - font-size: 15px; -} -.driver-route-details h4 { - color: #222222; - font-size: 20px; - margin: 0; -} -.driver-route-details .btn-primary { - padding: 10px 20px; - margin-top: 20px; -} -.driver-route-details .btn-primary:not(:disabled):not(.disabled):active { - background: var(--secondary-red); - border-color: var(--secondary-red); -} -.driver-route-details .route-box .col-md-6, -.driver-route-details .route-box .col-md-12{ - margin: 10px 0; -} - - -/* NOT AUTHORIZED */ -.notAuthorized { - background: url("../img/main-backgound.svg") bottom no-repeat; - background-size: contain; - padding: 150px 0 300px 0; - min-height: calc(100vh - 62.5px - 72.08px); -} -.notAuthorized h3 { - font-weight: bold; - color: #222222; - text-align: center; - margin-bottom: 20px; -} -.routes .btn-primary { - padding: 10px 20px; -} -.notAuthorized .row { - justify-content: center; - align-items: center; -} -.notAuthorized .btn-primary { - padding: 10px 20px; -} - - -/* FILTER */ -#submitFilter { - display: inline-block; -} -.dateFilter { - width: auto; - display: inline-block; -} -input.dateFilter { - margin-right: 20px; -} -p.dateFilter { - margin: 0px; - display: inline-block; -} -form.dateFilter { - float: right; -} - - -/* FOOTER */ -.footer { - text-align: center; - background: #efefef; - font-size: 15px; - color: #222222; - padding: 20px 0; -} -.footer p { - margin: 0; -} Index: uckIO/truckio/src/main/resources/static/img/erka.png:Zone.Identifier =================================================================== --- TruckIO/truckio/src/main/resources/static/img/erka.png:Zone.Identifier (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,3 +1,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=D:\Downloads D\kish-trans.zip Index: uckIO/truckio/src/main/resources/static/img/fulda.png:Zone.Identifier =================================================================== --- TruckIO/truckio/src/main/resources/static/img/fulda.png:Zone.Identifier (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,3 +1,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=D:\Downloads D\kish-trans.zip Index: uckIO/truckio/src/main/resources/static/img/kimmel.png:Zone.Identifier =================================================================== --- TruckIO/truckio/src/main/resources/static/img/kimmel.png:Zone.Identifier (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,3 +1,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=D:\Downloads D\kish-trans.zip Index: uckIO/truckio/src/main/resources/static/img/kish.png:Zone.Identifier =================================================================== --- TruckIO/truckio/src/main/resources/static/img/kish.png:Zone.Identifier (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,3 +1,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=D:\Downloads D\kish-trans.zip Index: uckIO/truckio/src/main/resources/static/img/main-backgound.svg =================================================================== --- TruckIO/truckio/src/main/resources/static/img/main-backgound.svg (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,519 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: uckIO/truckio/src/main/resources/static/img/mak.png:Zone.Identifier =================================================================== --- TruckIO/truckio/src/main/resources/static/img/mak.png:Zone.Identifier (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,3 +1,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=D:\Downloads D\kish-trans.zip Index: uckIO/truckio/src/main/resources/templates/addRoute.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/addRoute.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,133 +1,0 @@ - - - - - Home page - - - - - - - - - - -
-
-
- -
-
-
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/dispatcherReservationDetails.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/dispatcherReservationDetails.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,152 +1,0 @@ - - - - - Update Route Status - - - - - - - - - - -
- -
-

Ажурирање на статус на резервација

-
- -
-
- -
- - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/dispatcherRoutes.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/dispatcherRoutes.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,102 +1,0 @@ - - - - - Dispatcher's Routes - - - - - - - - - - -
- -
-

Активни рути

-
-

Нема активни резервации.

-
-
-
-
-
-
-

Започнува во

-

-
-
-
- -
-
-
-

Завршува во

-

-
-
-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
- Ажурирај статус -
- -
-
-
-
- -
- - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/driverRouteDetails.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/driverRouteDetails.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,126 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Детали за рута

-
-
- -
-
- -
-
-

Од

-

-
-
-
-
-

До

-

-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
-
-

Тип на возило

-

-
-
-
-
-

Марка на возило

-

-
-
-
-
- -
-
- -
-

Роба за транспорт

-
    -
  • -

    -

    -
    • -
-
- -
-
- -
- Назад -
- -
-
-
- -
- - - -
-
-

© Сите права се задржани. 2023

-
-
Index: uckIO/truckio/src/main/resources/templates/driverRoutes.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/driverRoutes.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,103 +1,0 @@ - - - - - Driver's Routes - - - - - - - - - - -
- -
-

Активни рути

-
-

Нема активни рути.

-
-
-
-
-
-
-

Започнува во

-

-
-
-
- -
-
-
-

Завршува во

-

-
-
-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
- Детали -
- -
-
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/home.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/home.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,198 +1,0 @@ - - - - - Home page - - - - - - - - - - - - -
- -
-
-

Резервирај транспорт на роба.

-
-
- -
-
-
-
-

5+

-

компании

-
-
-

20+

-

достапни рути

-
-
-

6

-

градови

-
-
-
-
- -
-
-
-
-

Направи резервација

-

Избери една од понудените рути и вид и количина на роба која сакаш да ја транспортираме.

-
-
- Резервирај -
-
-
-
- -
-
-

Компании со кои соработуваме

-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
- -
- - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/izvestaj.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/izvestaj.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,258 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Генерален извештај

-
-
- -
-
-

Компанија

-

-
-
- -
-
-

Вкупно вработени

-

-
-
- -
-
-

Вкупно клиенти

-

-
-
- -
-
-

Вкупно резервации

-

-
-
- -
-
-

Вкупно заработка

-

-
-
- -
-
-

Активни резервации

-

-
-
- -
-
-

Завршени резервации

-

-
-
- -
-
-

Резервации за одобрување

-

-
-
- -
-
-

Откажани резервации

-

-
-
- -
-
-
- -
-

Извештај за клиенти на компанијата и колку потрошиле во неа

-
-
-

Нема клиенти кои направиле резервација.

-
-
-
- -
-
-

Име на клиент

-

-
-
- -
-
-

Презиме на клиент

-

-
-
- -
-
-

Вкупна сума потрошено

-

-
-
- -
-
-

Вкупно резервации

-

-
-
- -
-
-
-
- -
-

Извештај за број на завршени резервации на дадена релација во секоја година

-
-
-

Нема завршени резервации.

-
-
-
- -
-
-

Почнува во

-

-
-
- -
-
-

Почнува во

-

-
-
- -
-
-

Година

-

-
-
- -
-
-

Вкупно завршени резервации

-

-
-
- -
-
-
-
- -
-

За секоја релација приказ на број на активни или завршени резервации и вкупна заработка направена од тие резервации, во последните 30 дена

-
-
-

Нема активни или завршени резервации во последните 30 дена.

-
-
-
- -
-
-

Почнува во

-

-
-
- -
-
-

Завршува во

-

-
-
- -
-
-

Број на активни или завршени резервации

-

-
-
- -
-
-

Вкупна заработка

-

-
-
- -
-
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/listCompanyRoutes.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/listCompanyRoutes.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,125 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-
-
-

Рути кои ги нуди компанијата

-
-
- Додај нова рута -
-
-
-
-
-
-
-

Започнува во

-

-
-
-
-
-

Завршува во

-

-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
-
-

Возач

-

-
-
-
-
-

Тип на возило

-

-
-
-
-
-

Марка на возило

-

-
-
-
-
-

Капацитет на возило

-

-
-
-
-
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/listRoutes.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/listRoutes.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,116 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-
-
-

Достапни рути

-
-
-
-

Од

- -

До

- - -
-
-
-
-

Нема достапни рути.

-
-
-
-
-
-
-

Започнува во

-

-
-
-
- -
-
-
-

Завршува во

-

-
-
-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
- Детали -
-
-
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/login.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/login.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,124 +1,0 @@ - - - - - Home page - - - - - - - - - - - - - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - - - Index: uckIO/truckio/src/main/resources/templates/myReservations.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/myReservations.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,101 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Мои резервации

-
- -
-
-
-
-

Започнува во

-

-
-
-
-
-

Завршува во

-

-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
-
-

Статус

-

-
-
-
- Детали -
-
-
- -
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/notAuthorized.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/notAuthorized.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,106 +1,0 @@ - - - - - Home page - - - - - - - - - - - - -
-
-
-
-
-

Не сте авторизиран за пристап до оваа страна.

- Врати се на почетна -
-
-
-
-
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/register.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/register.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,107 +1,0 @@ - - - - - Home page - - - - - - - - - - -
-
-
- -

Имате профил? Најави се!

-
-
-
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/reservationDetails.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/reservationDetails.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,146 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Детали за резервација

-
-
-
- -
-
-
-

Од

-

-
-
-
-
-

До

-

-
-
-
- -
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
- -
-
-
-

Компанија

-

-
-
-
-
-

Возач

-

-
-
-
- -
-
-
-

Тип на возило

-

-
-
-
-
-

Цена на резервација

-

/

-

-
-
-
- -
- -
-
-

Статус на резервација

-

- -

Роба за транспорт

-
    -
  • -

    -

    -
    • -
- - -
-
- -
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/reservationToConfirmDetails.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/reservationToConfirmDetails.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,163 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Резервација за одобрување

-
- -
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/reservationsToConfirm.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/reservationsToConfirm.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,117 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Резервации за одобрување

-
-

Нема резервации за одобрување.

-
-
-
-
-
-
-

Започнува во

-

-
-
-
-
-

Завршува во

-

-
-
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
-
-

Клиент

-

-
-
-
-
-

Телефон на клиент

-

-
-
-
-
- -
- -
-
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - Index: uckIO/truckio/src/main/resources/templates/routeDetails.html =================================================================== --- TruckIO/truckio/src/main/resources/templates/routeDetails.html (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,226 +1,0 @@ - - - - - Routes - - - - - - - - - - -
- -
-

Резервирај рута

-
-
-
- -
-
-
-

Од

-

-
-
-
-
-

До

-

-
-
-
- -
-
-
-

Тргнува на

-

-
-
-
-
-

Пристигнува на

-

-
-
-
- -
-
-
-

Компанија

-

-
-
-
-
-

Возач

-

-
-
-
- -
-
-
-

Тип на возило

-

-
-
-
-
-

Преостанат капацитет на возило

-

-

-
-
-
- -
- -
-
-

Роба за транспорт

-

Роба

- - - -
-
- -
-
-
- -
- - - - -
-
-

© Сите права се задржани. 2023

-
-
- - - - - Index: uckIO/truckio/src/test/java/project/truckio/TruckioApplicationTests.java =================================================================== --- TruckIO/truckio/src/test/java/project/truckio/TruckioApplicationTests.java (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,13 +1,0 @@ -package project.truckio; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class TruckioApplicationTests { - - @Test - void contextLoads() { - } - -} Index: uckIO/tunnel_scripta.cmd =================================================================== --- TruckIO/tunnel_scripta.cmd (revision 7ecbee6bd2e1497a1d171401a149091b367b09c4) +++ (revision ) @@ -1,15 +1,0 @@ -@echo off -echo "PRED DA JA STARTUVATE SKRIPTATA TREBA VO NEA DA GI STAVITE" -echo "VASHETO KORISNICHKO IME I LOZINKA ZA TUNELOT." -echo "PO STARTUVANJETO, BAZATA KJE BIDE DOSTAPNA NA PORTA LOCALHOST:9999" -echo "AKO SAKATE DA SLUSHA NA DRUGA PORTA, SMENETE JA SKRIPTATA SOODVETNO" -echo "AKO SAKATE DA STOPIRATE (CTRL+C)" -pause - -plink -v -ssh -2 -C -N -L 9999:localhost:5432 -pw df28b25b t_truckio@194.149.135.130 - -echo "VRSKATA TREBA DA STOI OTVORENA SE DODEKA IMATE PRISTAP DO SERVEROT" -echo "OVAA PORAKA KAZHUVA DEKA TUNELOT VEKJE SE ZATVORIL" -echo "AKO TOA SE SLUCHILO SAMO OD SEBE, IMATE PROBLEM SO VOSPOSTAVUVANJE" -echo "NA VRSKATA DO SERVEROT (BLOKADA) ILI VI SE POGRESHNI PARAMETRITE" -pause