浏览代码

correcciones

iksop 7 年之前
父节点
当前提交
6971e9cdaa

+ 1 - 0
app/AppKernel.php

@@ -33,6 +33,7 @@ class AppKernel extends Kernel
             new Base\OAuthClientBundle\BaseOAuthClientBundle(),
             new Base\OAuthClientBundle\BaseOAuthClientBundle(),
             new WebserviceBundle\WebserviceBundle(),
             new WebserviceBundle\WebserviceBundle(),
             new TemplateBundle\TemplateBundle(),
             new TemplateBundle\TemplateBundle(),
+            new WorkflowBundle\WorkflowBundle(),
             new ExtraDataBundle\ExtraDataBundle(),
             new ExtraDataBundle\ExtraDataBundle(),
             new DeviceBundle\DeviceBundle(),
             new DeviceBundle\DeviceBundle(),
             new OwnerVoterBundle\OwnerVoterBundle(),
             new OwnerVoterBundle\OwnerVoterBundle(),

+ 4 - 3
app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -4,15 +4,16 @@ parameters:
     url_stats: 'http://%env(HOST_STATS)%' # url app Stats
     url_stats: 'http://%env(HOST_STATS)%' # url app Stats
     url_ftth: 'http://%env(HOST_FTTH)%' # url app FTTH
     url_ftth: 'http://%env(HOST_FTTH)%' # url app FTTH
     url_radius: 'http://%env(HOST_RADIUS)%' # url app Radius
     url_radius: 'http://%env(HOST_RADIUS)%' # url app Radius
+    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%' # url app Radius
 
 
     client: '%url_base%/api/clients.json'
     client: '%url_base%/api/clients.json'
 
 
     sidebar_menu: # urls para el sidebar menu
     sidebar_menu: # urls para el sidebar menu
-        Base: '%url_base%'
+        FTTH: '%url_ftth%'
+        Cablemodem: '%url_cablemodem%'
         Mapas: '%url_mapas%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
         Stats: '%url_stats%'
-        FTTH: '%url_ftth%'
-        Radius: '%url_radius%'
+        Base: '%url_base%'
     
     
     remote_client_create_url: '%url_base%/admin/client/client/create' # Url base create client
     remote_client_create_url: '%url_base%/admin/client/client/create' # Url base create client
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_url: '%url_base%/api/devices.json'

+ 6 - 4
app/config/bundles/ik/webservice-bundle/parameters.yml.docker

@@ -4,18 +4,20 @@ parameters:
     url_stats: 'http://%env(HOST_STATS)%' # url app Stats
     url_stats: 'http://%env(HOST_STATS)%' # url app Stats
     url_ftth: 'http://%env(HOST_FTTH)%' # url app FTTH
     url_ftth: 'http://%env(HOST_FTTH)%' # url app FTTH
     url_radius: 'http://%env(HOST_RADIUS)%' # url app Radius
     url_radius: 'http://%env(HOST_RADIUS)%' # url app Radius
+    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%' # url app Radius
 
 
     client: '%url_base%/api/clients.json'
     client: '%url_base%/api/clients.json'
 
 
     sidebar_menu: # urls para el sidebar menu
     sidebar_menu: # urls para el sidebar menu
-        Base: '%url_base%'
+        FTTH: '%url_ftth%'
+        Cablemodem: '%url_cablemodem%'
         Mapas: '%url_mapas%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
         Stats: '%url_stats%'
-        FTTH: '%url_ftth%'
-        Radius: '%url_radius%'
+        Base: '%url_base%'
     
     
     remote_client_create_url: '%url_base%/admin/client/client/create' # Url base create client
     remote_client_create_url: '%url_base%/admin/client/client/create' # Url base create client
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
-    remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
+    remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
+

+ 5 - 2
app/config/config.yml

@@ -1,6 +1,10 @@
 imports:
 imports:
     - { resource: parameters.yml }
     - { resource: parameters.yml }
     - { resource: services.yml }
     - { resource: services.yml }
+
+    - { resource: "@DHCPBundle/Resources/config/services.yml" }
+    - { resource: "@IPv4Bundle/Resources/config/services.yml" }
+
     - { resource: "@AuditBundle/Resources/config/services.yml" }
     - { resource: "@AuditBundle/Resources/config/services.yml" }
     - { resource: "@AuthBundle/Resources/config/services.yml" }
     - { resource: "@AuthBundle/Resources/config/services.yml" }
     - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
     - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
@@ -13,14 +17,13 @@ imports:
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
     - { resource: "@TemplateBundle/Resources/config/services.yml" }
     - { resource: "@TemplateBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
+    - { resource: "@WorkflowBundle/Resources/config/services.yml" }
     - { resource: "bundles/friendsofsymfony/rest-bundle/config.yml" }
     - { resource: "bundles/friendsofsymfony/rest-bundle/config.yml" }
     - { resource: "bundles/hwi/oauth-bundle/parameters.yml" }
     - { resource: "bundles/hwi/oauth-bundle/parameters.yml" }
     - { resource: "bundles/ik/audit-bundle/parameters.yml" }
     - { resource: "bundles/ik/audit-bundle/parameters.yml" }
     - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "bundles/ik/device-bundle/parameters.yml" }
     - { resource: "bundles/ik/device-bundle/parameters.yml" }
     - { resource: "bundles/ik/webservice-bundle/parameters.yml" }
     - { resource: "bundles/ik/webservice-bundle/parameters.yml" }
-    - { resource: "@IPv4Bundle/Resources/config/services.yml" }
-    - { resource: "@DHCPBundle/Resources/config/services.yml" }
 
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # Put parameters here that don't need to change on each machine where the app is deployed
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration

+ 2 - 1
composer.json

@@ -159,7 +159,8 @@
         "ik/oauthclient-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/owner-voter-bundle": "dev-master",
         "ik/owner-voter-bundle": "dev-master",
-        "ik/template-bundle": "dev-master"
+        "ik/template-bundle": "dev-master",
+        "ik/workflow-bundle": "dev-master"
     },
     },
     "require-dev": {
     "require-dev": {
         "phpunit/phpunit": "^6.4",
         "phpunit/phpunit": "^6.4",

文件差异内容过多而无法显示
+ 662 - 971
composer.lock


+ 1 - 0
src/DHCPBundle/Entity/DHCP.php

@@ -4,6 +4,7 @@ namespace DHCPBundle\Entity;
 
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
+//use Symfony\Component\Validator\Constraints as Assert;
 
 
 /**
 /**
  * DHCP
  * DHCP

+ 1 - 0
src/DHCPBundle/Entity/DHCPModel.php

@@ -4,6 +4,7 @@ namespace DHCPBundle\Entity;
 
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
+use Symfony\Component\Validator\Constraints as Assert;
 
 
 /**
 /**
  * DHCPModel
  * DHCPModel