|
@@ -371,7 +371,7 @@ class StatTreeController extends Controller
|
|
foreach ($lineClause->clause->clauseArgs as $clauseArg) {
|
|
foreach ($lineClause->clause->clauseArgs as $clauseArg) {
|
|
|
|
|
|
$value = null;
|
|
$value = null;
|
|
- foreach ($lineClause->statTreeLineClauseArgs as $lineClauseArg) {
|
|
|
|
|
|
+ foreach ($lineClause->lineClauseArgs as $lineClauseArg) {
|
|
if($lineClauseArg->clause_arg_id === $clauseArg->id) {
|
|
if($lineClauseArg->clause_arg_id === $clauseArg->id) {
|
|
$value = $lineClauseArg->default_value;
|
|
$value = $lineClauseArg->default_value;
|
|
}
|
|
}
|
|
@@ -469,7 +469,7 @@ class StatTreeController extends Controller
|
|
// clause
|
|
// clause
|
|
$lineClause = $line->displayLineClause();
|
|
$lineClause = $line->displayLineClause();
|
|
$args = [];
|
|
$args = [];
|
|
- foreach($lineClause->statTreeLineClauseArgs as $stlcArg) {
|
|
|
|
|
|
+ foreach($lineClause->lineClauseArgs as $stlcArg) {
|
|
if($stlcArg->clauseArg) {
|
|
if($stlcArg->clauseArg) {
|
|
$args[] = [
|
|
$args[] = [
|
|
"arg_text" => $stlcArg->clauseArg->arg_text,
|
|
"arg_text" => $stlcArg->clauseArg->arg_text,
|
|
@@ -584,7 +584,7 @@ class StatTreeController extends Controller
|
|
$statTreeLineClause->save();
|
|
$statTreeLineClause->save();
|
|
|
|
|
|
// copy clause args for parent line clauses
|
|
// copy clause args for parent line clauses
|
|
- foreach ($parentLineClause->statTreeLineClauseArgs as $parentLineClauseArg) {
|
|
|
|
|
|
+ foreach ($parentLineClause->lineClauseArgs as $parentLineClauseArg) {
|
|
$statTreeLineClauseArg = new StatTreeLineClauseArg();
|
|
$statTreeLineClauseArg = new StatTreeLineClauseArg();
|
|
$nextId = DB::select("select nextval('stat_tree_line_clause_arg_id_seq')");
|
|
$nextId = DB::select("select nextval('stat_tree_line_clause_arg_id_seq')");
|
|
$statTreeLineClauseArg->id = $nextId[0]->nextval;
|
|
$statTreeLineClauseArg->id = $nextId[0]->nextval;
|