vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	skolehjem/resources/views/app/layout/base.blade.php
This commit is contained in:
Anders 2020-08-05 08:34:23 +02:00
parent 5120adebc0 4ed1d18392
commit b4634d4933
8 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skolehjem/app/Http/Controllers/UserController.php
View File

@ -369,7 +369,6 @@ class UserController extends Controller
->orWhere('name_last', 'LIKE', $request->search . '%') ->orWhere('name_last', 'LIKE', $request->search . '%')
->orWhere('phone', 'LIKE', $request->search . '%') ->orWhere('phone', 'LIKE', $request->search . '%')
->orWhere('email', 'LIKE', $request->search . '%') ->orWhere('email', 'LIKE', $request->search . '%')
->orWhere('name', 'LIKE', $request->search . '%')
->get(); ->get();
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();

1
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -60,7 +60,6 @@
data: {'search':$value}, data: {'search':$value},
success:function (data) { success:function (data) {
$('tbody').html(data); $('tbody').html(data);
console.log(data);
}, },
error:function (data) { error:function (data) {
console.log(data); console.log(data);

3
skolehjem/resources/views/admin/events/signups.blade.php
View File

@ -14,7 +14,7 @@
<form method="post" action="{{ route("events.store") }}"> <form method="post" action="{{ route("events.store") }}">
@csrf @csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input> <input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på navn, efternavn, tlf"></input>
</form> </form>
</div> </div>
@ -53,7 +53,6 @@
data: {'search':$value}, data: {'search':$value},
success:function (data) { success:function (data) {
$('tbody').html(data); $('tbody').html(data);
console.log(data);
}, },
error:function (data) { error:function (data) {
console.log(data); console.log(data);

1
skolehjem/resources/views/admin/roles/index.blade.php
View File

@ -53,7 +53,6 @@
data: {'search':$value}, data: {'search':$value},
success:function (data) { success:function (data) {
$('tbody').html(data); $('tbody').html(data);
console.log(data);
}, },
error:function (data) { error:function (data) {
console.log(data); console.log(data);

1
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -81,7 +81,6 @@
url: '{{route('users.search')}}', url: '{{route('users.search')}}',
data: {'search':$value, 'isCheck': $checkboxValue, 'page': page }, data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
success:function (data) { success:function (data) {
console.log($checkboxValue);
$('tbody').html(data); $('tbody').html(data);
}, },
error:function (data) { error:function (data) {

2
skolehjem/resources/views/admin/washing-reservations/index.blade.php
View File

@ -15,7 +15,7 @@
<form method="post" action="{{ route("washing-reservations.store") }}"> <form method="post" action="{{ route("washing-reservations.store") }}">
@csrf @csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på vaskemaskine, tid"></input> <input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på vaskemaskine, tid, bruger"></input>
</form> </form>

2
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<header class="row align-items-center" id="header"> <header class="row align-items-center" id="header">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"> <a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
<button class="ml-auto" id="toggle"> <button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars"></i> <i id="icon" class="fas fa-bars"></i>
</button> </button>

2
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -67,7 +67,7 @@
header.appendChild(headerDay); header.appendChild(headerDay);
let date = moment().locale("da").day(weekDay).week(week); let date = moment().locale("da").day(weekDay).week(week);
var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero(moment().locale("da").day(weekDay).week(week).month()) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date()); var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero((moment().locale("da").day(weekDay).week(week).month() + 1)) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
let dayHolder = document.createElement("div"); let dayHolder = document.createElement("div");
dayHolder.classList.add("calendar-table__col"); dayHolder.classList.add("calendar-table__col");