Skip to content
Snippets Groups Projects
Commit c38e44f9 authored by Jérôme DIDIER's avatar Jérôme DIDIER
Browse files

Version 2.6.12

parent 655675e1
No related branches found
No related tags found
No related merge requests found
2.6.11 (2025-02-25)
2.6.12 (2025-04-04)
------------------
* Bug fix : data entry return.
2.6.11 (2025-03-31)
------------------
* Bug fix : data entry return.
......
{
"name": "adonis",
"version": "2.6.11",
"version": "2.6.12",
"dependencies": {
"@pixi/graphics-extras": "^6.4.2",
"@pixi/layers": "^1.0.11",
......
......@@ -62,6 +62,6 @@ class FrontController extends AbstractController
*/
public function versionAction(): JsonResponse
{
return new JsonResponse(['version' => '2.6.11']);
return new JsonResponse(['version' => '2.6.12']);
}
}
......@@ -81,6 +81,10 @@ class IndividualRepository extends ServiceEntityRepository
return $result > 0;
}
/**
* @param list<string> $where
* @param list<string> $joins
*/
private function createNativeQueryForProject(DataEntryProject $project, array $where = [], array $joins = []): NativeQuery
{
$rsm = new ResultSetMapping();
......@@ -119,7 +123,7 @@ class IndividualRepository extends ServiceEntityRepository
$whereClause = implode(' AND ', ['p16_.id = ?', ...$where]);
if ($this->hasSublock($project)) {
$sql = <<<EOQ
SELECT $selectClause, b2_.name,
SELECT $selectClause
FROM adonis.individual i1_
INNER JOIN adonis.business_object b2_ ON i1_.id = b2_.id
INNER JOIN adonis.project_object p0_ ON i1_.id = p0_.id
......@@ -134,7 +138,7 @@ class IndividualRepository extends ServiceEntityRepository
EOQ;
} else {
$sql = <<<EOQ
SELECT $selectClause, b2_.name
SELECT $selectClause
FROM adonis.individual i1_
INNER JOIN adonis.business_object b2_ ON i1_.id = b2_.id
INNER JOIN adonis.project_object p0_ ON i1_.id = p0_.id
......
......@@ -82,6 +82,10 @@ class UnitParcelRepository extends ServiceEntityRepository
return $result > 0;
}
/**
* @param list<string> $where
* @param list<string> $joins
*/
private function createNativeQueryForProject(DataEntryProject $project, array $where = [], array $joins = []): NativeQuery
{
$rsm = new ResultSetMapping();
......@@ -126,7 +130,7 @@ class UnitParcelRepository extends ServiceEntityRepository
$whereClause = implode(' AND ', ['p16_.id = ?', ...$where]);
if ($this->hasSublock($project)) {
$sql = <<<EOQ
SELECT $selectClause, b2_.name,
SELECT $selectClause
FROM adonis.unit_plot u3_
INNER JOIN adonis.business_object b2_ ON u3_.id = b2_.id
INNER JOIN adonis.project_object p0_ ON u3_.id = p0_.id
......@@ -140,7 +144,7 @@ class UnitParcelRepository extends ServiceEntityRepository
EOQ;
} else {
$sql = <<<EOQ
SELECT $selectClause, b2_.name
SELECT $selectClause
FROM adonis.unit_plot u3_
INNER JOIN adonis.business_object b2_ ON u3_.id = b2_.id
INNER JOIN adonis.project_object p0_ ON u3_.id = p0_.id
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment