Skip to content
Snippets Groups Projects
Commit 20235b66 authored by iLazaKnight's avatar iLazaKnight
Browse files

Sprint 1 done

parent e67866d0
No related merge requests found
Pipeline #7740 failed with stages
...@@ -89,7 +89,7 @@ class AddMemberController extends Controller ...@@ -89,7 +89,7 @@ class AddMemberController extends Controller
if ($request->hasFile('list_members')) { if ($request->hasFile('list_members')) {
try { try {
$extension = $request->file('list_members')->getClientOriginalExtension(); $extension = $request->file('list_members')->getClientOriginalExtension();
if ($extension === 'xlsx') { if ($extension === 'xlsx' || $extension === 'xls') {
$path = $request->file('list_members')->getRealPath(); $path = $request->file('list_members')->getRealPath();
$data = Excel::load($path, function($reader) {})->get(); $data = Excel::load($path, function($reader) {})->get();
if (!empty($data)) { if (!empty($data)) {
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
@section('content') @section('content')
@include('inc.addmembertab') @include('inc.addmembertab')
<div class="addCSVForm"> <div class="addXLSXForm">
{!! Form::open(['action' => ['AddMemberController@importXLSX'], 'method' => 'POST', 'enctype' => 'multipart/form-data']) !!} {!! Form::open(['action' => ['AddMemberController@importXLSX'], 'method' => 'POST', 'enctype' => 'multipart/form-data']) !!}
<div class="form-group"> <div class="form-group">
{{Form::label('list_members','Members')}} {{Form::label('list_members','Members')}}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<a class="nav-item nav-link aCSVAdd" href="/admin/addCSV"> <a class="nav-item nav-link aCSVAdd" href="/admin/addCSV">
<i class="addMenu">Upload CSV</i> <i class="addMenu">Upload CSV</i>
</a> </a>
<a class="nav-item nav-link XLSXAdd" href="/admin/addCSV"> <a class="nav-item nav-link XLSXAdd" href="/admin/addXLSX">
<i class="addMenu">Upload XLSX</i> <i class="addMenu">Upload XLSX</i>
</a> </a>
......
...@@ -22,6 +22,7 @@ Route::get('/about', function () { ...@@ -22,6 +22,7 @@ Route::get('/about', function () {
}); });
Route::post('/importcsv','AddMemberController@importCSV'); Route::post('/importcsv','AddMemberController@importCSV');
Route::post('/importxlsx','AddMemberController@importXLSX');
Route::post('/importmember','AddMemberController@importMember'); Route::post('/importmember','AddMemberController@importMember');
//Route::resource('profile', 'MembersController'); //Route::resource('profile', 'MembersController');
...@@ -83,6 +84,7 @@ Route::group( [ 'prefix' => 'admin' ], function() ...@@ -83,6 +84,7 @@ Route::group( [ 'prefix' => 'admin' ], function()
Route::resource('members', 'MembersController'); Route::resource('members', 'MembersController');
Route::post('/importcsv','AddMemberController@importCSV'); Route::post('/importcsv','AddMemberController@importCSV');
Route::post('/importxlsx','AddMemberController@importXLSX');
Route::post('/importmember','AddMemberController@importMember'); Route::post('/importmember','AddMemberController@importMember');
Route::post('/answers/rate/{answer}/{user}/{each}', 'AnswersController@giveRating'); Route::post('/answers/rate/{answer}/{user}/{each}', 'AnswersController@giveRating');
...@@ -100,5 +102,9 @@ Route::group( [ 'prefix' => 'admin' ], function() ...@@ -100,5 +102,9 @@ Route::group( [ 'prefix' => 'admin' ], function()
return view('admin.addCSV'); return view('admin.addCSV');
})->middleware('admin'); })->middleware('admin');
Route::get('/addXLSX', function () {
return view('admin.addXLSX');
})->middleware('admin');
Route::post('/answer/store_ajax', 'AnswersController@storeAjax'); Route::post('/answer/store_ajax', 'AnswersController@storeAjax');
}); });
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment