bug fixed

parent ce350136
......@@ -859,12 +859,12 @@ public function findMergingSchoolsforUndo(Request $request, $classId, $sector, $
$lockSmallClasses = $epalConfig->lock_small_classes->getString();
if ($lockSmallClasses !== "1" )
{
$list[] = array('res' => "0");
$list[] = array('res' => 0);
return $this->respondWithStatus($list, Response::HTTP_OK);
}
else
{
$list[] = array('res' => "1");
$list[] = array('res' => 1);
return $this->respondWithStatus($list, Response::HTTP_OK);
}
}
......
......@@ -21,7 +21,7 @@ import { IAppState } from "../../store/store";
<breadcrumbs></breadcrumbs>
</div>
<div class = "loading" *ngIf="!(regions$ | async) ">
<div class = "loading" *ngIf="!(regions$ | async) || (regions$ | async).size===0 ">
</div>
<!-- <div class="row equal">
<div class="col-md-12"> -->
......
......@@ -229,10 +229,12 @@ export class HelperDataService implements OnInit, OnDestroy {
this.lockApprov$.next(data);
this.lockApprov$.getValue().forEach(lockapp =>
{
this.lockapp = lockapp.res;
this.lockapp = lockapp.res;
console.log(this.lockapp,"lookapp");
if (this.lockapp === 0){
if (classActive === 1)
console.log("1");
; if (classActive === 1)
getConnectionString = `${AppSettings.API_ENDPOINT}/regions/list`;
else if (classActive === 2)
getConnectionString = `${AppSettings.API_ENDPOINT}/sectorsperschool/list?sector_id=${courseActive}`;
......@@ -244,6 +246,7 @@ export class HelperDataService implements OnInit, OnDestroy {
}
else
{
console.log("2");
if (classActive === 1)
getConnectionString = `${AppSettings.API_ENDPOINT}/epal/getregions`;
else if (classActive === 2)
......
Markdown is supported
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