-
Notifications
You must be signed in to change notification settings - Fork 453
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into community-patch-2019-02-09
- Loading branch information
Showing
57 changed files
with
832 additions
and
1,514 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# This configuration was used SourceLevel to review the portabilis/i-educar-portabilis repository | ||
# on 44050ca4916a346cb01216fec3231836d3523cbe. | ||
# You can make this the default configuration for future reviews by moving this | ||
# file to your repository as `.sourcelevel.yml` and pushing it to GitHub, and tweak | ||
# it as you wish - To know more on how to change this file to better review your | ||
# repository you can go to https://docs.sourcelevel.io/configuration and see the configuration | ||
# details. | ||
--- | ||
pull_requests: | ||
comments: false | ||
engines: | ||
phan: | ||
enabled: false | ||
fixme: | ||
enabled: false | ||
phpmd: | ||
enabled: false | ||
eslint: | ||
enabled: false | ||
csslint: | ||
enabled: false | ||
scss-lint: | ||
enabled: false | ||
remark-lint: | ||
enabled: true | ||
exclude_paths: | ||
- config | ||
- public | ||
- tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<?php | ||
|
||
|
||
namespace App\Http\Controllers; | ||
|
||
|
||
use App\Models\LegacyRegistration; | ||
|
||
class EnrollmentHistoryController extends Controller | ||
{ | ||
/** | ||
* Show the profile for the given user. | ||
* | ||
* @param int $id | ||
* @return View | ||
*/ | ||
public function show($id) | ||
{ | ||
$this->breadcrumb('Histórico de enturmações da matrícula', [ | ||
url('intranet/educar_index.php') => 'Escola', | ||
]); | ||
|
||
$this->menu(578); | ||
|
||
$registration = LegacyRegistration::find($id); | ||
|
||
return view('enrollments.enrollmentHistory', ['registration' => $registration]); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
|
||
namespace App\Models; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
use Illuminate\Database\Eloquent\Relations\BelongsTo; | ||
|
||
class LegacySchoolSingleQueueCandidate extends Model | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
protected $table = 'pmieducar.escola_candidato_fila_unica'; | ||
|
||
/** | ||
* @var string | ||
*/ | ||
protected $primaryKey = 'ref_cod_candidato_fila_unica'; | ||
|
||
/** | ||
* @var array | ||
*/ | ||
protected $fillable = [ | ||
'ref_cod_escola', | ||
'ref_cod_candidato_fila_unica', | ||
'sequencial', | ||
]; | ||
|
||
/** | ||
* @var bool | ||
*/ | ||
public $timestamps = false; | ||
|
||
/** | ||
* @return BelongsTo | ||
*/ | ||
public function candidate() | ||
{ | ||
return $this->belongsTo(LegacySingleQueueCandidate::class, 'ref_cod_candidato_fila_unica'); | ||
} | ||
|
||
/** | ||
* @return BelongsTo | ||
*/ | ||
public function school() | ||
{ | ||
return $this->belongsTo(LegacySchool::class, 'ref_cod_escola'); | ||
} | ||
} |
Oops, something went wrong.