Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

Commit

Permalink
migrations and shortlist module done
Browse files Browse the repository at this point in the history
  • Loading branch information
ashwini0529 committed Aug 11, 2016
1 parent d242302 commit 2cdfac9
Show file tree
Hide file tree
Showing 9 changed files with 291 additions and 145 deletions.
265 changes: 126 additions & 139 deletions .idea/workspace.xml

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@ public function awardMarks(Request $request)
$submission->checked = 1;
$submission->save();
$url = '/user/'.$userId.'/submissions';
/*
* Update Marks in Users table.
*
* */
$user = User::find($userId);
$userMarks = $user->marks;
$user->marks = $userMarks+$marks;
$user->save();
return redirect($url);
}
else return 'some issue';
Expand All @@ -183,4 +191,22 @@ public function adminDashboard()
return view('User.Admin.dashboard',compact('technicalRegistrations','managementRegistrations','designRegistrations','checkedSubmissions','uncheckedSubmissions'));
}

/*
* Function to shortlist people Domain-wise
* */

public function shortlist()
{
return view('User.Admin.shortListForm');
}

public function getShortlistedCandidates(Request $request)
{
$domain = $request->domain;
$number = $request->number;
$people = User::where('domain',$domain)->orderBy('marks', 'desc')->take($number)->get();
return view('User.Admin.getShortlistedCandidates',compact('people'));

}
}

4 changes: 3 additions & 1 deletion app/Http/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@
Route::get('/admin/award/marks', 'UserController@award');
Route::get('/admin/problem/delete/{id}','ProblemController@softDelete');
Route::get('/admin/problem/undelete/{id}','ProblemController@recoverSoftDelete');
Route::get('/admin/dashboard','UserController@adminDashboard');
Route::get('/admin/dashboard','UserController@adminDashboard');
Route::get('/admin/users/shortlist','UserController@shortlist');
Route::post('/admin/users/shortlist','UserController@getShortlistedCandidates');
2 changes: 1 addition & 1 deletion app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
'name', 'email', 'password','role','domain','regno','why_gdg','experience','linkedin','github','behance','selected'
'name', 'email', 'password','role','domain','regno','why_gdg','experience','linkedin','github','behance','selected','marks','contact'
];

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class AddMarksAndContactColumnToUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('users', function ($table) {
$table->string('contact');
$table->float('marks')->default(0.00);

});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('users', function ($table) {
$table->dropColumn('contact');
$table->dropColumn('marks');
});
}
}
Binary file added public/uploads/submissions/4_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions resources/views/User/Admin/getShortlistedCandidates.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@extends('layouts.app')

@section('content')
<div class="container">
<div class="row">
<div class="col-md-10 col-md-offset-1">

<div class="col-md-12">
<p style="color: green;">Following people are shortlisted</p>
<table class="table table-hover">
<thead>
<tr>
<th>Name</th>
<th>Reg No</th>
<th>Marks</th>

</tr>
</thead>
<tbody>
@foreach($people as $candidate)
<tr>
<td>{{$candidate->name}}</td>
<td>{{$candidate->regno}}</td>
<td>{{$candidate->marks}}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection
60 changes: 60 additions & 0 deletions resources/views/User/Admin/shortListForm.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
@extends('layouts.app')

@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Shortlist Prople</div>
<div class="panel-body">

<form class="form-horizontal" role="form" method="POST" action="{{ url('/admin/users/shortlist') }}">
{{ csrf_field() }}


<div class="form-group{{ $errors->has('people') ? ' has-error' : '' }}">
<label for="people" class="col-md-4 control-label">Number of People you want to shortlist</label>


<div class="col-md-6">

<input type="text" class="form-control" name="number">



</div>
</div>
<div class="form-group{{ $errors->has('people') ? ' has-error' : '' }}">
<label for="people" class="col-md-4 control-label">Domain</label>


<div class="col-md-6">

<select class="form-control" name="domain">
<option value="1">Technical</option>
<option value="2">Mangement</option>
<option value="3">Design</option>
</select>

</div>
</div>




<br>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">
<i class="fa fa-btn fa-sign-in"></i> Shortlist
</button>

</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@endsection
12 changes: 8 additions & 4 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Left Side Of Navbar -->
<ul class="nav navbar-nav">
<li><a href="{{ url('/home') }}">Home</a></li>
<li><a href="{{ url('/problems') }}">Problem Statements</a></li>
<li><a href="{{ url('/user/dashboard') }}">Dashboard</a></li>
@if(\Illuminate\Support\Facades\Auth::user())
<li><a href="{{ url('/home') }}">Home</a></li>
<li><a href="{{ url('/problems') }}">Problem Statements</a></li>
<li><a href="{{ url('/user/dashboard') }}">Dashboard</a></li>
@endif
</ul>

<!-- Right Side Of Navbar -->
Expand All @@ -70,7 +72,9 @@

<li><a href="{{ url('/admin/show/users') }}">Show all users</a></li>
<li><a href="{{ url('/admin/problem/add') }}">Add Problem</a></li>
<li><a href="{{ url('/admin/problems/all') }}">All Problems</a></li>
<li><a href="{{ url('/admin/problem/add') }}">Add Problem</a></li>
<li><a href="{{ url('/admin/dashboard') }}">Admin Dashboard</a></li>
<li><a href="{{ url('/admin/users/shortlist') }}">Shortlist</a></li>
</ul>
</li>
@endif
Expand Down

0 comments on commit 2cdfac9

Please sign in to comment.