Commit 3b294442 authored by François Agneray's avatar François Agneray
Browse files

#71 => done

parent a9bb153b
Pipeline #5302 passed with stages
in 2 minutes and 41 seconds
......@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #64: Data management system
### Changed
- #71: Update metamodel database
- #68: Deleting property table_name from attribute entity
- #67: Body Parsing and Content Length slim's middlewares
- #61: Docker images are stored on the gitlab internal registry
......
This diff is collapsed.
......@@ -103,6 +103,7 @@ final class AttributeAction extends AbstractAction
$attribute->setOrderDisplay($parsedBody['order_display']);
$attribute->setDetail($parsedBody['detail']);
$attribute->setRendererDetail($parsedBody['renderer_detail']);
$attribute->setRendererDetailConfig($parsedBody['renderer_detail_config']);
$attribute->setOptions($parsedBody['options']);
$attribute->setVoUtype($parsedBody['vo_utype']);
$attribute->setVoUcd($parsedBody['vo_ucd']);
......
......@@ -129,6 +129,7 @@ final class AttributeListAction extends AbstractAction
$attribute->setDetail($this->getValue($parsedBody, 'detail'));
}
$attribute->setRendererDetail($this->getValue($parsedBody, 'renderer_detail'));
$attribute->setRendererDetailConfig($this->getValue($parsedBody, 'renderer_detail_config'));
$attribute->setOptions($this->getValue($parsedBody, 'options'));
$attribute->setVoUtype($this->getValue($parsedBody, 'vo_utype'));
$attribute->setVoUcd($this->getValue($parsedBody, 'vo_ucd'));
......@@ -141,7 +142,7 @@ final class AttributeListAction extends AbstractAction
} else {
$criteriaFamily = $this->em->find(
'App\Entity\CriteriaFamily',
$$parsedBody['id_criteria_family']
$parsedBody['id_criteria_family']
);
}
$attribute->setCriteriaFamily($criteriaFamily);
......@@ -150,7 +151,7 @@ final class AttributeListAction extends AbstractAction
} else {
$outputCategory = $this->em->find(
'App\Entity\OutputCategory',
$$parsedBody['id_output_category']
$parsedBody['id_output_category']
);
}
$attribute->setOutputCategory($outputCategory);
......
......@@ -65,8 +65,6 @@ final class DatasetAction extends AbstractAction
'label',
'description',
'display',
'count',
'vo',
'data_path',
'config',
'public',
......@@ -119,8 +117,6 @@ final class DatasetAction extends AbstractAction
$dataset->setDescription($parsedBody['description']);
$dataset->setDatasetFamily($family);
$dataset->setDisplay($parsedBody['display']);
$dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']);
$dataset->setConfig($parsedBody['config']);
$dataset->setPublic($parsedBody['public']);
......
......@@ -69,8 +69,6 @@ final class DatasetListAction extends AbstractAction
'label',
'description',
'display',
'count',
'vo',
'data_path',
'config',
'public',
......@@ -123,8 +121,6 @@ final class DatasetListAction extends AbstractAction
$dataset->setLabel($parsedBody['label']);
$dataset->setDescription($parsedBody['description']);
$dataset->setDisplay($parsedBody['display']);
$dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']);
$dataset->setConfig($parsedBody['config']);
$dataset->setPublic($parsedBody['public']);
......
......@@ -150,13 +150,6 @@ class Attribute implements \JsonSerializable
*/
protected $rendererConfig;
/**
* @var int
*
* @Column(type="integer", name="display_detail", nullable=true)
*/
protected $displayDetail;
/**
* @var bool
*
......@@ -185,6 +178,13 @@ class Attribute implements \JsonSerializable
*/
protected $detail = false;
/**
* @var int
*
* @Column(type="integer", name="display_detail", nullable=true)
*/
protected $displayDetail;
/**
* @var string
*
......@@ -192,6 +192,13 @@ class Attribute implements \JsonSerializable
*/
protected $rendererDetail;
/**
* @var string
*
* @Column(type="json", name="renderer_detail_config", nullable=true)
*/
protected $rendererDetailConfig;
/**
* @var string
*
......@@ -558,6 +565,16 @@ class Attribute implements \JsonSerializable
$this->rendererDetail = $rendererDetail;
}
public function getRendererDetailConfig()
{
return $this->rendererDetailConfig;
}
public function setRendererDetailConfig($rendererDetailConfig)
{
$this->rendererDetailConfig = $rendererDetailConfig;
}
public function getOptions()
{
return $this->options;
......@@ -608,12 +625,13 @@ class Attribute implements \JsonSerializable
'placeholder_max' => $this->getPlaceholderMax(),
'renderer' => $this->getRenderer(),
'renderer_config' => $this->getRendererConfig(),
'display_detail' => $this->getDisplayDetail(),
'selected' => $this->getSelected(),
'order_by' => $this->getOrderBy(),
'order_display' => $this->getOrderDisplay(),
'detail' => $this->getDetail(),
'display_detail' => $this->getDisplayDetail(),
'renderer_detail' => $this->getRendererDetail(),
'renderer_detail_config' => $this->getRendererDetailConfig(),
'options' => $this->getOptions(),
'vo_utype' => $this->getVoUtype(),
'vo_ucd' => $this->getVoUcd(),
......
......@@ -59,20 +59,6 @@ class Dataset implements \JsonSerializable
*/
protected $display;
/**
* @var int
*
* @Column(type="integer", nullable=true)
*/
protected $count;
/**
* @var bool
*
* @Column(type="boolean", nullable=true)
*/
protected $vo;
/**
* @var string
*
......@@ -168,26 +154,6 @@ class Dataset implements \JsonSerializable
$this->display = $display;
}
public function getCount()
{
return $this->count;
}
public function setCount($count)
{
$this->count = $count;
}
public function getVo()
{
return $this->vo;
}
public function setVo($vo)
{
$this->vo = $vo;
}
public function getDataPath()
{
return $this->dataPath;
......@@ -251,8 +217,6 @@ class Dataset implements \JsonSerializable
'label' => $this->getLabel(),
'description' => $this->getDescription(),
'display' => $this->getDisplay(),
'count' => $this->getCount(),
'vo' => $this->getVo(),
'data_path' => $this->getDataPath(),
'config' => $this->getConfig(),
'public' => $this->getPublic(),
......
......@@ -41,7 +41,7 @@ class Instance implements \JsonSerializable
/**
* @var string
*
* @Column(type="string", nullable=true)
* @Column(type="string", name="client_url", nullable=true)
*/
protected $clientUrl;
......
......@@ -152,6 +152,7 @@ final class AttributeActionTest extends TestCase
'order_display' => null,
'detail' => false,
'renderer_detail' => null,
'renderer_detail_config' => null,
'options' => null,
'vo_utype' => null,
'vo_ucd' => null,
......
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