Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@milomilo33
milomilo33 committed Jun 27, 2021
2 parents 74404cf + 27c0d96 commit fc2623c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
42 changes: 21 additions & 21 deletions src/main/resources/data-postgres.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ insert into user_role(user_id, role_id) values ('[email protected]',
insert into user_role(user_id, role_id) values ('[email protected]', 5)
insert into user_role(user_id, role_id) values ('[email protected]', 5)

insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-04-04','false', 0,'[email protected]' , '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-06-08','false', 1,'[email protected]', '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-06-11','false', 0,'[email protected]', '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-06-08','false', 1,'[email protected]', '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-06-27','false', 0,'[email protected]' , '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-08-08','false', 1,'[email protected]', '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-10-11','false', 0,'[email protected]', '[email protected]')
insert into order_t (deadline, deleted, status, admin_email, supplier_email) values ('2021-08-08','false', 1,'[email protected]', '[email protected]')

insert into pharmacy_orders (pharmacy_id, orders_id) values (1, 1)
insert into pharmacy_orders (pharmacy_id, orders_id) values (2, 2)
Expand Down Expand Up @@ -322,9 +322,9 @@ insert into pharmacy_ratings (pharmacy_id, ratings_id) values (2, 2)
insert into pharmacy_ratings (pharmacy_id, ratings_id) values (1, 3)
insert into pharmacy_ratings (pharmacy_id, ratings_id) values (3, 13)

insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (true, '2021-03-03', '2021-04-03', false, 'Zahtev za godisnji odmor', '', '[email protected]')
insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (false, '2021-04-03', '2021-05-04', false, 'Zahtev za odsustvo', '', '[email protected]')
insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (true, '2021-04-03', '2021-05-04', false, 'Zahtev za bolovanje', '', '[email protected]')
insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (true, '2021-08-03', '2021-08-23', false, 'Zahtev za godisnji odmor', '', '[email protected]')
insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (false, '2021-07-03', '2021-07-04', false, 'Zahtev za odsustvo', '', '[email protected]')
insert into request (accepted, date_from, date_to, deleted, description, rejection_reason, employee_email) values (true, '2021-07-10', '2021-07-14', false, 'Zahtev za bolovanje', '', '[email protected]')

insert into pharmacy_requests (pharmacy_id, requests_id) values (1, 1)
insert into pharmacy_requests (pharmacy_id, requests_id) values (2, 2)
Expand All @@ -340,17 +340,17 @@ insert into prescription_medicament (deleted, expiry_date, purchased, quantity,
insert into prescription_medicament (deleted, expiry_date, purchased, quantity, medicament_id) values (false, '2022-06-12', false, 130, 3)


insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 5, 899.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-05', false, 5, 899.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 6, 1199.99, false)

insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 7, 999.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 0, 1500.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 1, 99.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 1, 129.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 0, 2000.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 0, 2500.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 0, 1700.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', '2022-01-01', false, 0, 2200.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 7, 999.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 1500.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 1, 99.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 1, 129.99, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 2000.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 2500.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 1700.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 2200.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-05-24', null, false, 0, 550.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 500.00, false)
insert into price (date_from, date_to, deleted, points, value, promotion) values ('2021-01-01', null, false, 0, 350.00, false)
Expand Down Expand Up @@ -409,13 +409,13 @@ insert into e_prescription_prescription_medicaments (e_prescription_id, prescrip
insert into e_prescription_prescription_medicaments (e_prescription_id, prescription_medicaments_id) values (2, 2)
insert into e_prescription_prescription_medicaments (e_prescription_id, prescription_medicaments_id) values (3, 3)

insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-01-05', 2, 10000, 1, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-01-10', 2, 100000, 3, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-06-28', 2, 10000, 1, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-10-12', 2, 100000, 3, '[email protected]', null)

insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-01-10', 2, 100000, 4, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-01-10', 2, 500, 4, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-08-09', 2, 100000, 4, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-08-10', 2, 500, 4, '[email protected]', null)

insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-01-10', 2, 500, 2, '[email protected]', null)
insert into offer (deadline, status, total_price, order_id, supplier_email, accepted_date) values ('2021-08-10', 2, 500, 2, '[email protected]', null)


insert into order_t_medicament_items (order_id, medicament_items_id) values (1, 6)
Expand Down
1 change: 1 addition & 0 deletions src/main/ui/vue/dist/css/app.f309f055.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/main/ui/vue/dist/js/app.07566e04.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/ui/vue/dist/js/app.07566e04.js.map
View file

Large diffs are not rendered by default.

0 comments on commit fc2623c

Please sign in to comment.