File tree Expand file tree Collapse file tree 2 files changed +10
-10
lines changed
java/ru/xpressed/javatemplatescoursework/entity Expand file tree Collapse file tree 2 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ public class Order {
2828
2929 private String info ;
3030
31- private SimpleDateFormat dateFormat = new SimpleDateFormat ("dd.MM.y H:m " );
31+ private SimpleDateFormat dateFormat = new SimpleDateFormat ("dd.MM.y HH:mm " );
3232
3333 private String departure ;
3434
Original file line number Diff line number Diff line change 6767
6868 < div class ="row ">
6969 < div class ="col-1 ml-4 "> Id</ div >
70- < div class ="col-2 "> When</ div >
71- < div class ="col-3 "> From</ div >
72- < div class ="col-3 "> To</ div >
73- < div class ="col-2 mr-4 "> When</ div >
70+ < div class ="col-3 col-xl- 2 "> When</ div >
71+ < div class ="col-2 col-xl- 3 "> From</ div >
72+ < div class ="col-2 col-xl- 3 "> To</ div >
73+ < div class ="col-3 col-xl- 2 mr-4 "> When</ div >
7474 </ div >
7575 < hr class ="mx-3 " style ="background-color: white ">
7676
7777 < div th:each ="order : ${orders} ">
7878 < div class ="row ">
79- < div class ="col-1 ml-4 mt-2 " th:text ="${order.id} "> </ div >
80- < div class ="col-2 mt-2 " th:text ="${order.departure} "> </ div >
81- < div class ="col-3 mt-2 " th:text ="${order.load} "> </ div >
82- < div class ="col-3 mt-2 " th:text ="${order.destination} "> </ div >
83- < div class ="col-2 mr-4 mt-2 " th:text ="${order.arrival} "> </ div >
79+ < div class ="col-1 ml-4 mt-2 " th:text ="${order.id} "> a </ div >
80+ < div class ="col-3 col-xl- 2 mt-2 " th:text ="${order.departure} "> b </ div >
81+ < div class ="col-2 col-xl- 3 mt-2 " th:text ="${order.load} "> c </ div >
82+ < div class ="col-2 col-xl- 3 mt-2 " th:text ="${order.destination} "> d </ div >
83+ < div class ="col-3 col-xl- 2 mr-4 mt-2 " th:text ="${order.arrival} "> e </ div >
8484 < div th:if ="${order.btn == 0} ">
8585 < button type ="button " th:attr ="onclick=|redirect('${order.id}')| " title ="Cancel and Delete " class ="btn btn-secondary btn-lg mr-4 " style ="color: black; background-color: white; border: 3px solid red; border-radius: 30px; position: absolute; right: 0 "> X</ button >
8686 </ div >
You can’t perform that action at this time.
0 commit comments