Changeset 9dd4182
- Timestamp:
- 07/09/23 17:51:32 (18 months ago)
- Branches:
- main
- Children:
- 99d8816
- Parents:
- 708a5bc
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
FullyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java
r708a5bc r9dd4182 28 28 private LocalDateTime datecreated; 29 29 private LocalDateTime dateapproved; 30 private LocalDateTime datedelivered; 30 31 @Column(nullable = false) 31 32 @Enumerated(EnumType.STRING) -
FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java
r708a5bc r9dd4182 164 164 throw new InvalidArgumentsException(); 165 165 } 166 order.setDatedelivered(LocalDateTime.now()); 166 167 order.getArticlesList().forEach(orderedArticles -> orderedArticles.setArticlestatus(ArticleStatus.DELIVERED)); 167 168 } -
FullyStocked/src/main/resources/templates/home.html
r708a5bc r9dd4182 40 40 </div> 41 41 42 <div class="row ">42 <div class="row m-0"> 43 43 <div class="col-md-8 offset-md-2 text-center"> 44 44 <h2>За апликацијата</h2> -
FullyStocked/src/main/resources/templates/homeManager.html
r708a5bc r9dd4182 66 66 </div> 67 67 68 <div class="row ">68 <div class="row m-0"> 69 69 <div class="col-md-8 offset-md-2 text-center"> 70 70 <h2>За апликацијата</h2> -
FullyStocked/src/main/resources/templates/homeSupplier.html
r708a5bc r9dd4182 49 49 </div> 50 50 51 <div class="row ">51 <div class="row m-0"> 52 52 <div class="col-md-8 offset-md-2 text-center"> 53 53 <h2>За апликацијата</h2> -
FullyStocked/src/main/resources/templates/homeWorker.html
r708a5bc r9dd4182 58 58 </div> 59 59 60 <div class="row ">60 <div class="row m-0"> 61 61 <div class="col-md-8 offset-md-2 text-center"> 62 62 <h2>За апликацијата</h2> -
SQLScripts/kreiranje.sql
r708a5bc r9dd4182 129 129 dateCreated timestamp default now(), 130 130 dateApproved timestamp, 131 dateDelivered timestamp, 131 132 priority varchar(50) not null, 132 133 managerUserId integer not null, … … 245 246 246 247 ); 248 249 ------------------------- 250 251 alter table question_availability_for_storedarticle add constraint pk_question_availability_for_storedarticle primary key (questionId, sArticleId); 252 253 ------------------------- 254 255 alter table article_belongs_to_category add constraint pk_article_belongs_to_category primary key (articleId, categoryId); 256 257 ------------------------- 258 259 alter table supplier_supplies_category add constraint pk_supplier_supplies_category primary key (userId, categoryId);
Note:
See TracChangeset
for help on using the changeset viewer.