diff --git a/DD/assets/Model/DD-Model.asta b/DD/assets/Model/DD-Model.asta index c80ec96..1ef01b3 100644 Binary files a/DD/assets/Model/DD-Model.asta and b/DD/assets/Model/DD-Model.asta differ diff --git a/IT/Implementation/Backend/src/main/resources/public/signup.html b/IT/Implementation/Backend/src/main/resources/public/signup.html index 2a742ad..eec48bc 100644 --- a/IT/Implementation/Backend/src/main/resources/public/signup.html +++ b/IT/Implementation/Backend/src/main/resources/public/signup.html @@ -43,7 +43,7 @@

Password must be at leat 8 characters long and must - contain at leas one symbol, one uppercase letter and one number. + contain at leas one symbol (!@#\$&*~), one uppercase letter and one number.

diff --git a/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js b/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js index 3922016..f794052 100644 --- a/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js +++ b/IT/Implementation/Backend/src/main/resources/public/static/js/login/signup.js @@ -19,7 +19,7 @@ var signupContainer = new Vue({ function submitForm() { var form = document.signUpForm; - const passRegexp = new RegExp("r'^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\\$&*~]).{8,}$'"); + const passRegexp = new RegExp("(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\\$&*~]).{8,}$"); if (/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(form.username.value)) { let role, jsonReq; if (signupContainer.manager) { diff --git a/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js b/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js index 3465f07..32a4f6e 100644 --- a/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js +++ b/IT/Implementation/Backend/src/main/resources/public/static/js/tickets.js @@ -49,6 +49,9 @@ $(document).ready(function () { } } }); + $('#ticketsTable').DataTable( { + "order": [[ 1, "desc" ]] + } ); }, error: function (err) { if (err.status == 403) { diff --git a/IT/Implementation/Backend/src/main/resources/public/tickets.html b/IT/Implementation/Backend/src/main/resources/public/tickets.html index 6089e3f..be316a3 100644 --- a/IT/Implementation/Backend/src/main/resources/public/tickets.html +++ b/IT/Implementation/Backend/src/main/resources/public/tickets.html @@ -7,6 +7,8 @@ + +
@@ -36,8 +38,8 @@

My Tickets

-
- +
+
@@ -119,12 +121,13 @@

About Us

- + + \ No newline at end of file diff --git a/IT/dd.pdf b/IT/dd.pdf deleted file mode 100644 index ba07df5..0000000 Binary files a/IT/dd.pdf and /dev/null differ
Store Date