mirror of
https://github.com/Karaka-Management/oms-Script.git
synced 2026-01-11 20:38:42 +00:00
Merge branch 'develop' of https://github.com/Karaka-Management/oms-Helper into develop
This commit is contained in:
commit
9f42a7e0ca
|
|
@ -76,7 +76,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
|
|||
$account = new Account();
|
||||
TestUtils::setMember($account, 'id', 1);
|
||||
|
||||
$permission = new AccountPermission();
|
||||
$permission = new AccountPermission();
|
||||
$permission->unit = 1;
|
||||
$permission->app = 1;
|
||||
$permission->setPermission(
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
|
|||
$account = new Account();
|
||||
TestUtils::setMember($account, 'id', 1);
|
||||
|
||||
$permission = new AccountPermission();
|
||||
$permission = new AccountPermission();
|
||||
$permission->unit = 1;
|
||||
$permission->app = 2;
|
||||
$permission->setPermission(
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -562,7 +562,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -664,7 +664,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -766,7 +766,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -868,7 +868,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -970,7 +970,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -1072,7 +1072,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -1174,7 +1174,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -1276,7 +1276,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
@ -1378,7 +1378,7 @@ $excel->getActiveSheet()
|
|||
->getNumberFormat()
|
||||
->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
|
||||
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles = $excel->getActiveSheet()->getStyle('H' . $i)->getConditionalStyles();
|
||||
$conditionalStyles[] = $badBudget;
|
||||
$excel->getActiveSheet()->getStyle('H' . $i)->setConditionalStyles($conditionalStyles);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user