From bd975c53f338cdd2d58d5179b9270b4c98d3cea9 Mon Sep 17 00:00:00 2001 From: ASH Date: Mon, 11 Mar 2019 22:46:51 +0400 Subject: [PATCH 1/4] #71 adding pages and layout --- .../ulstu/configuration/MvcConfiguration.java | 1 + src/main/resources/public/css/tasks.css | 24 +++++ src/main/resources/public/js/tasks.js | 0 src/main/resources/templates/index.html | 2 +- .../templates/students/dashboard.html | 24 +++++ .../fragments/taskNavigationFragment.html | 25 +++++ .../resources/templates/students/task.html | 91 +++++++++++++++++++ .../resources/templates/students/tasks.html | 36 ++++++++ 8 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/public/css/tasks.css create mode 100644 src/main/resources/public/js/tasks.js create mode 100644 src/main/resources/templates/students/dashboard.html create mode 100644 src/main/resources/templates/students/fragments/taskNavigationFragment.html create mode 100644 src/main/resources/templates/students/task.html create mode 100644 src/main/resources/templates/students/tasks.html diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 3e8d66f..81761d6 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -14,6 +14,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter { registry.addViewController("/papers/{articlename:\\w+}"); registry.addViewController("/grants/{articlename:\\w+}"); registry.addViewController("/conferences/{articlename:\\w+}"); + registry.addViewController("/students/{articlename:\\w+}"); registry.addRedirectViewController("/", "/index"); registry.addRedirectViewController("/default", "/index"); } diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css new file mode 100644 index 0000000..3b6f671 --- /dev/null +++ b/src/main/resources/public/css/tasks.css @@ -0,0 +1,24 @@ +.bootstrap-tagsinput{ + + width: 100%; + padding: .375rem .75rem; +} + +.bootstrap-tagsinput .label{ + + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: 700; + line-height: 2.5; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} + +.bootstrap-tagsinput .label-info{ + + background-color: orange; +} \ No newline at end of file diff --git a/src/main/resources/public/js/tasks.js b/src/main/resources/public/js/tasks.js new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 40a1281..2d86945 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -88,7 +88,7 @@
- +
diff --git a/src/main/resources/templates/students/dashboard.html b/src/main/resources/templates/students/dashboard.html new file mode 100644 index 0000000..d9f6e8a --- /dev/null +++ b/src/main/resources/templates/students/dashboard.html @@ -0,0 +1,24 @@ + + + + + +
+
+
+
+

Работа со студентами

+
+
+
+ + + +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskNavigationFragment.html b/src/main/resources/templates/students/fragments/taskNavigationFragment.html new file mode 100644 index 0000000..cf8a4cf --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskNavigationFragment.html @@ -0,0 +1,25 @@ + + + + + +
+
+ + Список +
+
+ Панель + управления +
+ +
+ + Добавить задачу + +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/task.html b/src/main/resources/templates/students/task.html new file mode 100644 index 0000000..b348078 --- /dev/null +++ b/src/main/resources/templates/students/task.html @@ -0,0 +1,91 @@ + + + + + + + + +
+ +
+
+
+
+

Редактирование задачи

+
+
+
+
+
+
+
+
+ +
+ + +

+
+ +
+ + +
+
+ + +
+ +
+ + +
+ + +
+ +
+ +
+ +
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ + +
+
+
+ +
+
+
+
+ +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html new file mode 100644 index 0000000..5f370a0 --- /dev/null +++ b/src/main/resources/templates/students/tasks.html @@ -0,0 +1,36 @@ + + + + + + +
+
+ +
+
+
+
+

Работа со студентами

+
+
+
+
+
+ + + +
+
+
+
+
+
+ +
+ + +
+ + \ No newline at end of file From af3c0c0faad0eecaa03e3cea6cda1a4ad20c8736 Mon Sep 17 00:00:00 2001 From: ASH Date: Tue, 26 Mar 2019 10:49:26 +0400 Subject: [PATCH 2/4] #71 fixing layout n adding --- src/main/resources/public/css/tasks.css | 2 +- src/main/resources/public/js/tasks.js | 43 +++++++++++++++++++ .../students/fragments/taskLineFragment.html | 22 ++++++++++ .../fragments/taskStatusFragment.html | 37 ++++++++++++++++ .../resources/templates/students/task.html | 37 +++++++++++++--- .../resources/templates/students/tasks.html | 36 ++++++++++++++-- 6 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/templates/students/fragments/taskLineFragment.html create mode 100644 src/main/resources/templates/students/fragments/taskStatusFragment.html diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css index 3b6f671..2f42db5 100644 --- a/src/main/resources/public/css/tasks.css +++ b/src/main/resources/public/css/tasks.css @@ -21,4 +21,4 @@ .bootstrap-tagsinput .label-info{ background-color: orange; -} \ No newline at end of file +} diff --git a/src/main/resources/public/js/tasks.js b/src/main/resources/public/js/tasks.js index e69de29..6bf160c 100644 --- a/src/main/resources/public/js/tasks.js +++ b/src/main/resources/public/js/tasks.js @@ -0,0 +1,43 @@ +/*\n' + + '
\n' + + '
\n' + + '
\n' + + ' Удалить статью?\n' + + ' \n' + + '
\n' + + + '
\n' + + ' Да'+ + ' '+ + '
\n' + + '
\n' + + '
\n' + + '
'); + } + $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm')); + $('#dataConfirmOK').attr('href', href); + $('#dataConfirmModal').modal({show:true}); + return false; + }); + +}); +/*]]>*/ \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskLineFragment.html b/src/main/resources/templates/students/fragments/taskLineFragment.html new file mode 100644 index 0000000..79ad5d7 --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskLineFragment.html @@ -0,0 +1,22 @@ + + + + + + +
+
+ + + Первая хадач + Курсовая работа + + + + + +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskStatusFragment.html b/src/main/resources/templates/students/fragments/taskStatusFragment.html new file mode 100644 index 0000000..9af7d50 --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskStatusFragment.html @@ -0,0 +1,37 @@ + + + + + + + + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/students/task.html b/src/main/resources/templates/students/task.html index b348078..533c8f6 100644 --- a/src/main/resources/templates/students/task.html +++ b/src/main/resources/templates/students/task.html @@ -18,11 +18,12 @@
+
-
+
@@ -45,8 +46,6 @@
- -
@@ -68,17 +67,45 @@
-
-
+
+
+
+
+
Дата создания:
+
+
+ + + text + +
+
+
+
+
+
+
Дата изменения:
+
+
+ + + text + +
+
+
+
diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html index 5f370a0..076f7ba 100644 --- a/src/main/resources/templates/students/tasks.html +++ b/src/main/resources/templates/students/tasks.html @@ -2,6 +2,7 @@ + @@ -16,13 +17,42 @@
+
- - - + +
+
+
+
Фильтр:
+ + + +
From e93f6187791b0a2c9aea9a99e03000be152e3de8 Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Sun, 31 Mar 2019 13:12:43 +0400 Subject: [PATCH 3/4] #56 added database schema --- .../db/changelog-20190331_000010-schema.xml | 57 +++++++++++++++++++ src/main/resources/db/changelog-master.xml | 1 + 2 files changed, 58 insertions(+) create mode 100644 src/main/resources/db/changelog-20190331_000010-schema.xml diff --git a/src/main/resources/db/changelog-20190331_000010-schema.xml b/src/main/resources/db/changelog-20190331_000010-schema.xml new file mode 100644 index 0000000..26a98df --- /dev/null +++ b/src/main/resources/db/changelog-20190331_000010-schema.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml index 132e510..2f0764a 100644 --- a/src/main/resources/db/changelog-master.xml +++ b/src/main/resources/db/changelog-master.xml @@ -21,5 +21,6 @@ + \ No newline at end of file From 2ad03a5689d9f2f6d87f2b8d45476443c1c1f118 Mon Sep 17 00:00:00 2001 From: ASH Date: Sun, 31 Mar 2019 13:47:15 +0400 Subject: [PATCH 4/4] #71 adding dashboard --- .../templates/students/dashboard.html | 2 ++ .../fragments/taskDashboardFragment.html | 24 +++++++++++++++++++ .../fragments/taskNavigationFragment.html | 2 +- .../fragments/taskStatusFragment.html | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/students/fragments/taskDashboardFragment.html diff --git a/src/main/resources/templates/students/dashboard.html b/src/main/resources/templates/students/dashboard.html index d9f6e8a..94ea121 100644 --- a/src/main/resources/templates/students/dashboard.html +++ b/src/main/resources/templates/students/dashboard.html @@ -12,7 +12,9 @@

Работа со студентами

+
+
diff --git a/src/main/resources/templates/students/fragments/taskDashboardFragment.html b/src/main/resources/templates/students/fragments/taskDashboardFragment.html new file mode 100644 index 0000000..0daea58 --- /dev/null +++ b/src/main/resources/templates/students/fragments/taskDashboardFragment.html @@ -0,0 +1,24 @@ + + + + + + +
+
+
+ + +
+
+ + + title +

type

+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/students/fragments/taskNavigationFragment.html b/src/main/resources/templates/students/fragments/taskNavigationFragment.html index cf8a4cf..717930d 100644 --- a/src/main/resources/templates/students/fragments/taskNavigationFragment.html +++ b/src/main/resources/templates/students/fragments/taskNavigationFragment.html @@ -9,7 +9,7 @@ Список
- Панель управления
diff --git a/src/main/resources/templates/students/fragments/taskStatusFragment.html b/src/main/resources/templates/students/fragments/taskStatusFragment.html index 9af7d50..8f3d800 100644 --- a/src/main/resources/templates/students/fragments/taskStatusFragment.html +++ b/src/main/resources/templates/students/fragments/taskStatusFragment.html @@ -5,6 +5,7 @@ +