Skip to content

Commit

Permalink
Add missing parameter for string function. Make it optional when not …
Browse files Browse the repository at this point in the history 
…available.
  • Loading branch information
@srobotta
srobotta committed Dec 4, 2024
1 parent 7da679a commit ba405cc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 46 deletions.
55 changes: 10 additions & 45 deletions classes/repository/instance_repository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public function save(instance $instance) {

foreach ($category->get_headers() as $header) {
$dbolocalizedstring = db_localized_string::from_localized_string($header,
localized_string_type::INSTANCE_CATEGORY_HEADER, $category->get_id());
localized_string_type::INSTANCE_CATEGORY_HEADER, $category->get_id(), $instance->get_id());
if ($header->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbolocalizedstring);
} else {
Expand All @@ -377,7 +377,7 @@ public function save(instance $instance) {

foreach ($criterion->get_descriptions() as $localizedstring) {
$dbolocalizedstring = db_localized_string::from_localized_string($localizedstring,
localized_string_type::INSTANCE_CRITERION, $criterion->get_id());
localized_string_type::INSTANCE_CRITERION, $criterion->get_id(), $instance->get_id());
if ($localizedstring->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbolocalizedstring);
} else {
Expand All @@ -396,7 +396,7 @@ public function save(instance $instance) {

foreach ($subrating->get_titles() as $title) {
$dbotitle = db_localized_string::from_localized_string($title,
localized_string_type::INSTANCE_SUBRATING_TITLE, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_TITLE, $subrating->get_id(), $instance->get_id());
if ($title->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbotitle);
} else {
Expand All @@ -407,7 +407,7 @@ public function save(instance $instance) {
// Subrating description.
foreach ($subrating->get_descriptions() as $description) {
$dbodescription = db_localized_string::from_localized_string($description,
localized_string_type::INSTANCE_SUBRATING_DESCRIPTION, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_DESCRIPTION, $subrating->get_id(), $instance->get_id());
if ($description->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbodescription);
} else {
Expand All @@ -417,7 +417,7 @@ public function save(instance $instance) {

foreach ($subrating->get_verynegatives() as $verynegative) {
$dboverynegative = db_localized_string::from_localized_string($verynegative,
localized_string_type::INSTANCE_SUBRATING_VERY_NEGATIVE, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_VERY_NEGATIVE, $subrating->get_id(), $instance->get_id());
if ($verynegative->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dboverynegative);
} else {
Expand All @@ -426,7 +426,7 @@ public function save(instance $instance) {
}
foreach ($subrating->get_negatives() as $negative) {
$dbonegative = db_localized_string::from_localized_string($negative,
localized_string_type::INSTANCE_SUBRATING_NEGATIVE, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_NEGATIVE, $subrating->get_id(), $instance->get_id());
if ($negative->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbonegative);
} else {
Expand All @@ -435,7 +435,7 @@ public function save(instance $instance) {
}
foreach ($subrating->get_positives() as $positive) {
$dbopositive = db_localized_string::from_localized_string($positive,
localized_string_type::INSTANCE_SUBRATING_POSITIVE, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_POSITIVE, $subrating->get_id(), $instance->get_id());
if ($positive->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dbopositive);
} else {
Expand All @@ -444,7 +444,7 @@ public function save(instance $instance) {
}
foreach ($subrating->get_verypositives() as $verypositive) {
$dboverypositive = db_localized_string::from_localized_string($verypositive,
localized_string_type::INSTANCE_SUBRATING_VERY_POSITIVE, $subrating->get_id());
localized_string_type::INSTANCE_SUBRATING_VERY_POSITIVE, $subrating->get_id(), $instance->get_id());
if ($verypositive->get_id() == 0) {
$DB->insert_record(tables::LOCALIZED_STRING_TABLE, $dboverypositive);
} else {
Expand All @@ -471,47 +471,12 @@ public function delete(int $instanceid) {

$dbocategories = $DB->get_records(tables::INSTANCE_CATEGORY_TABLE, ["instanceid" => $instanceid]);
foreach ($dbocategories as $dbocategory) {
// Delete category headers.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_CATEGORY_HEADER), "foreignkey" => $dbocategory->id]);
// Delete all strings.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE, ["instanceid" => $instanceid]);

// Delete category criteria.
$dbocriteria = $DB->get_records(tables::INSTANCE_CRITERION_TABLE, ["categoryid" => $dbocategory->id]);
foreach ($dbocriteria as $dbocriterion) {

// Delete criterion description.
$dbodescriptions = $DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_CRITERION), "foreignkey" => $dbocriterion->id]);

// Delete criterion subratings.
$dbosubratings = $DB->get_records(tables::INSTANCE_SUBRATING_TABLE, ["criterionid" => $dbocriterion->id]);
foreach ($dbosubratings as $dbosubrating) {

// Delete subrating titles.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_TITLE), "foreignkey" => $dbosubrating->id]);

// Delete subrating descriptions.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_DESCRIPTION), "foreignkey" => $dbosubrating->id]);

// Delete subrating very negative texts.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_VERY_NEGATIVE), "foreignkey" => $dbosubrating->id]);

// Delete subrating negative texts.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_NEGATIVE), "foreignkey" => $dbosubrating->id]);

// Delete subrating positive texts.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_POSITIVE), "foreignkey" => $dbosubrating->id]);

// Delete subrating very positive texts.
$DB->delete_records(tables::LOCALIZED_STRING_TABLE,
["typeid" => localized_string_type::str2id(localized_string_type::INSTANCE_SUBRATING_VERY_POSITIVE), "foreignkey" => $dbosubrating->id]);
}

// Delete subratings.
$dbosubratings = $DB->delete_records(tables::INSTANCE_SUBRATING_TABLE, ["criterionid" => $dbocriterion->id]);
}
Expand Down
2 changes: 1 addition & 1 deletion classes/repository/model/db_localized_string.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class db_localized_string {
* @throws \Exception
*/
public static function from_localized_string(localized_string $localizedstring, string $type,
int $foreignkey, int $instanceid): db_localized_string {
int $foreignkey, int $instanceid = 0): db_localized_string {
if (!localized_string_type::exists($type)) {
throw new \Exception("unknown localized_string_type");
}
Expand Down

0 comments on commit ba405cc

Please sign in to comment.