Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/Http/Controllers/FrameController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function index(Request $request) {
'user' => User::where('dcid', $request->get('user'))->firstOrFail(),
'student' => Student::where('dcid', substr($request->get('frn'), 3))->firstOrFail(),
'ieps' => Iep::where('studentsdcid', substr($request->get('frn'), 3))->orderBy('start_date', 'desc')->get(),
'portal' => $request->get('portal'),
];

return view('frame.index', $data);
Expand All @@ -32,9 +33,10 @@ public function iep(Request $request) {
if ($request->has('iep')) {
$frn = $request->get('frn');
$iep = $request->get('iep');
$portal = $request->get('portal');
$data = Iep::getFormResponseData($iep);

return view('frame.fetch.iep', compact('data', 'iep', 'frn'));
return view('frame.fetch.iep', compact('data', 'iep', 'frn', 'portal'));
}
}

Expand All @@ -44,7 +46,7 @@ public function save(Request $request) {

$iep = new Iep();
$iep->studentsdcid = $student->dcid;
$iep->case_manager = $user->lastfirst;
$iep->case_manager = $user->lastfirst; //Should be replaced with actual case manager from CM class
$iep->is_active = false;
$iep->start_date = new Carbon($request->json('start_date'));
$iep->whocreated = $user->lastfirst;
Expand Down
24 changes: 24 additions & 0 deletions app/Iep/Iep.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,30 @@ public function updateStartDate($fbResponse) {
}
}

public function getCaseManager($dcid) {

$rawSql = "SELECT
t.lastfirst AS case_manager
FROM
students s
INNER JOIN cc ON cc.studentid = s.id
INNER JOIN terms tm ON cc.schoolid = tm.schoolid AND tm.id = cc.termid
INNER JOIN sections sc ON cc.sectionid = sc.id
INNER JOIN teachers t ON sc.teacher = t.id
WHERE
cc.course_number IN ('0010')
AND to_date(?,'YYYY-MM-DD') BETWEEN cc.dateenrolled AND cc.dateleft
AND s.dcid=?";

$casemgr = DB::connection('oracle')->select($rawSql,[$this->start_date->toDateString(),$dcid]);
if(count($casemgr)==1){
return $casemgr[0]->case_manager;
}
else{
return "";
}
}

public function updateCaseManager($fbResponse) {
$data = $this->getResponseData($fbResponse->id);
foreach ($data as $row) {
Expand Down
5 changes: 4 additions & 1 deletion public/build/js/all-3577461909.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion public/js/all.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion resources/assets/js/iep.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ function loadIep() {
if (typeof iepContent[iepid] === "undefined") {
var params = [
'iep=' + iepid,
'frn=' + frn
'frn=' + frn,
'portal=' + portal
];
window.fetch('iep?' + params.join('&'))
.then(status)
Expand Down
3 changes: 3 additions & 0 deletions resources/assets/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@
.ballot-box-checked, .ballot-box, .checkmark {
font-size: 1.1em;
}
.nobreak {
page-break-inside:avoid;
}
7 changes: 5 additions & 2 deletions resources/views/frame/fetch/iep.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<div class="pull-left" style="margin-left: 20px">
<button id="btnPrintSelection" type="submit" class="btn btn-primary"><i class="fa fa-spinner fa-pulse fa-fw hide"></i> Print Selected</button>
</div>
<div class="pull-right" style="margin-right: 20px">
<a href="https://goo.gl/forms/OT3kVpVL3Mrrv58Y2" target="_BLANK">Report an Issue</a>
</div>
</div>
</div>

Expand All @@ -50,8 +53,8 @@
<img src="{{ $form->responseid ? secure_asset('img/flag-green.png') : secure_asset('img/flag-blue.png') }}" title="Last Entry: {{ $form->modified_on }}" />
</td>
<td>
<a href="{{ config('iep.powerschool_url') }}admin/formbuilder/students/studentform.html?formid={{ $form->formid }}&amp;type={{ $form->form_type }}&amp;responseid={{ $form->responseid }}&amp;iep={{ $iep }}&amp;frn={{ $frn }}" target="_blank">
{{ $form->form_title }}
<a href="{{ config('iep.powerschool_url') }}{{ ( $portal == "teacher" ? "teachers/studentpages/" : "admin/formbuilder/students/" )}}studentform.html?formid={{ $form->formid }}&amp;type={{ $form->form_type }}&amp;responseid={{ $form->responseid }}&amp;iep={{ $iep }}&amp;frn={{ $frn }}" target="_blank">
{{ $form->form_title }}
</a>
</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/frame/iep-snippet.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h6 class="iep-title">
Start Date: <span class="start-date">{{ $iep->getFormattedStartDate() }}</span>
<br>
CaseManager: <span class="case-manager">{{ $iep->case_manager }}</span>
Case Manager: <span class="case-manager1">{{ (isset($student) ? $iep->getCaseManager($student->dcid) : '') }}</span>
@if (is_null($iep->activated_at) && $iep->getExpireDate()->gt(new \Carbon\Carbon()))
<div class="pull-right">
<a href="javascript:void(0);" class="activate-iep">Activate this IEP</a>
Expand Down
1 change: 1 addition & 0 deletions resources/views/frame/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
var user = {!! json_encode($user) !!};
var student = {!! json_encode($student) !!}
var frn = "{{ $frn }}";
var portal = "{{ $portal }}";
</script>
<script src="//code.jquery.com/jquery-1.12.0.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
Expand Down