Merge branch 'master' of https://bitbucket.org/ikflowdat/cablemodem

app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -1,9 +1,9 @@
 parameters:
-    device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
-    device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
-    device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
-    device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
-    api_device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
-    api_device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
-    api_device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
-    api_device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
+    device_check_url: 'https://%env(HOST_BASE)%/api/devices/check.json'
+    device_post_url: 'https://%env(HOST_BASE)%/api/devices.json'
+    device_delete_post_url: 'https://%env(HOST_BASE)%/api/devices/'
+    device_put_url: 'https://%env(HOST_BASE)%/api/devices/'
+    api_device_check_url: 'https://%env(HOST_BASE)%/api/devices/check.json'
+    api_device_post_url: 'https://%env(HOST_BASE)%/api/devices.json'
+    api_device_delete_post_url: 'https://%env(HOST_BASE)%/api/devices/'
+    api_device_put_url: 'https://%env(HOST_BASE)%/api/devices/'

app/config/bundles/ik/device-bundle/parameters.yml.docker

@@ -1,9 +1,9 @@
 parameters:
-    device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
-    device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
-    device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
-    device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
-    api_device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
-    api_device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
-    api_device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
-    api_device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
+    device_check_url: 'https://%env(HOST_BASE)%/api/devices/check.json'
+    device_post_url: 'https://%env(HOST_BASE)%/api/devices.json'
+    device_delete_post_url: 'https://%env(HOST_BASE)%/api/devices/'
+    device_put_url: 'https://%env(HOST_BASE)%/api/devices/'
+    api_device_check_url: 'https://%env(HOST_BASE)%/api/devices/check.json'
+    api_device_post_url: 'https://%env(HOST_BASE)%/api/devices.json'
+    api_device_delete_post_url: 'https://%env(HOST_BASE)%/api/devices/'
+    api_device_put_url: 'https://%env(HOST_BASE)%/api/devices/'

app/config/import_data.yml

@@ -47,3 +47,5 @@ Cablemodem:
         mta_enabled: mta1_enabled
         tenancy_id: tenancy_id
         comments: comments
+        workflow_id: { value: 1 }
+        current_state: { value: active }

composer.lock

@@ -1457,7 +1457,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "14a5b3cbf7a371f89d4c323672f89be0eed7675e"
+                "reference": "7d318d860d3bfedd1882f5f8ac806c46c6238878"
             },
             "type": "library",
             "autoload": {
@@ -1472,7 +1472,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-08-07T11:46:29+00:00"
+            "time": "2018-08-09T12:30:11+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1547,7 +1547,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-                "reference": "cbe6fe78fbd902ee545806105967b89f50e244e7"
+                "reference": "6bfead82caa4fefdc56bf8060b275a56347feb70"
             },
             "type": "library",
             "autoload": {
@@ -1562,7 +1562,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-02-19T12:57:23+00:00"
+            "time": "2018-08-08T13:51:34+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1643,7 +1643,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "7e50327475180f03fa24a2fa5ee1dc01dadd2bfa"
+                "reference": "e702a3895f9d3fe6712a76d25cb9d908216ef20f"
             },
             "require": {
                 "ik/base-admin-bundle": "*"
@@ -1661,7 +1661,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2018-07-04T14:44:27+00:00"
+            "time": "2018-08-09T12:30:44+00:00"
         },
         {
             "name": "ik/webservice-bundle",

src/CablemodemBundle/Admin/ProfileAdmin.php

@@ -54,8 +54,8 @@ class ProfileAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
-            ->add('downstream')
-            ->add('upstream')
+            ->add('downstream',null,array('help' => $this->trans('help.profile_downstream'), 'attr' => array('placeholder' => $this->trans('help.profile_value_default'))))
+            ->add('upstream',null,array('help' => $this->trans('help.profile_downstream'), 'attr' => array('placeholder' => $this->trans('help.profile_value_default'))))
             ->add('filtroUpload')
             ->add('filtroDownload')
             ->add('maxCpe')

src/CablemodemBundle/Entity/Profile.php

@@ -82,6 +82,11 @@ class Profile  implements TenancyIdTraitInterface
      */
     protected $maxCpe;
 
+    public function __construct()
+    {
+        $this->downstream = $this->getDefault('downstream');
+        $this->upstream = $this->getDefault('upstream');
+    }
 
     /**
      * @return string
@@ -166,7 +171,12 @@ class Profile  implements TenancyIdTraitInterface
      */
     public function setDownstream($downstream)
     {
-        $this->downstream = $downstream;
+        if(is_null($downstream)) {
+            $this->downstream = $this->getDefault('downstream');
+        } else {
+            $this->downstream = $downstream;
+        }
+        
 
         return $this;
     }
@@ -178,7 +188,12 @@ class Profile  implements TenancyIdTraitInterface
      */
     public function setUpstream($upstream)
     {
-        $this->upstream = $upstream;
+        if(is_null($upstream)) {
+            $this->upstream = $this->getDefault('upstream');
+        } else {
+            $this->upstream = $upstream;
+        }
+
 
         return $this;
     }

src/CablemodemBundle/Resources/translations/CablemodemBundle.es.yml

@@ -156,3 +156,6 @@ form_label_number: Número
 voip.number: Número
 voip.password: Password
 voip.technology: Tecnología
+help:
+    profile_downstream: Expresado en bits
+    profile_value_default: Al deja en blanco el valor, se asignará un valor por defecto!