Browse Source

Cambios en nombres de usuarios

master
parent
commit
23273dad38
  1. 8
      httpdocs/.idea/.gitignore
  2. 8
      httpdocs/.idea/httpdocs.iml
  3. 8
      httpdocs/.idea/modules.xml
  4. 4
      httpdocs/.idea/php.xml
  5. 6
      httpdocs/.idea/vcs.xml
  6. 10
      httpdocs/config/services.yaml
  7. 6
      httpdocs/config/services/admin.yaml
  8. 10
      httpdocs/config/services/registrations.yaml
  9. 6
      httpdocs/config/validator/validator.yaml
  10. 2
      httpdocs/repositories/rule-engine-bundle-acdr/Command/ActionProcessorCommand.php
  11. 8
      httpdocs/repositories/rule-engine-bundle-acdr/Command/FAImporterCommand.php
  12. 2
      httpdocs/repositories/rule-engine-bundle-acdr/Command/FillTranslationCommand.php
  13. 6
      httpdocs/repositories/rule-engine-bundle-acdr/Command/GEImporterCommand.php
  14. 2
      httpdocs/repositories/rule-engine-bundle-acdr/Command/NormalizeTranslationsCommand.php
  15. 4
      httpdocs/src/Admin/ContableAdmin.php
  16. 8
      httpdocs/src/Admin/ContactsAdmin.php
  17. 6
      httpdocs/src/Admin/ConvocatoriaAdmin.php
  18. 8
      httpdocs/src/Admin/LicitadorAdmin.php
  19. 2
      httpdocs/src/Admin/ServicioAdmin.php
  20. 2
      httpdocs/src/Admin/SupervisorAdmin.php
  21. 12
      httpdocs/src/Admin/WorkShopAdmin.php
  22. 10
      httpdocs/src/Blocks/StatsBlockService.php
  23. 4
      httpdocs/src/Blocks/TrainerClassesBlock.php
  24. 10
      httpdocs/src/Controller/Admin/CalendarAdminController.php
  25. 6
      httpdocs/src/Controller/Admin/ContableAdminController.php
  26. 10
      httpdocs/src/Controller/Admin/ContadorAdminController.php
  27. 2
      httpdocs/src/Controller/Admin/DashboardAdminController.php
  28. 4
      httpdocs/src/Controller/Admin/EncuestaAdminController.php
  29. 4
      httpdocs/src/Controller/Admin/FormularioAdminController.php
  30. 2
      httpdocs/src/Controller/Admin/IndicadorAdminController.php
  31. 18
      httpdocs/src/Controller/Admin/LicitadorAdminController.php
  32. 6
      httpdocs/src/Controller/Admin/ProcesoTareaAdminController.php
  33. 10
      httpdocs/src/Controller/Admin/RealizarTareaAdminController.php
  34. 2
      httpdocs/src/Controller/Admin/RespuestasFormularioAdminController.php
  35. 4
      httpdocs/src/Controller/Admin/RespuestasTareaAdminController.php
  36. 2
      httpdocs/src/Controller/Admin/ServicioAdminController.php
  37. 14
      httpdocs/src/Controller/Admin/SupervisorAdminController.php
  38. 4
      httpdocs/src/Controller/Admin/TareaAdminController.php
  39. 79
      httpdocs/src/Controller/Admin/TrainerAdminController.php.save
  40. 91
      httpdocs/src/Controller/Admin/TrainerAdminController.php.save.1
  41. 4
      httpdocs/src/Controller/Admin/WorkShopsAdminController.php
  42. 6
      httpdocs/src/Controller/Api/CountersApiController.php
  43. 22
      httpdocs/src/Controller/Api/GuardarTareaApiController.php
  44. 4
      httpdocs/src/Controller/Api/GuardarTareaApiNonAdminController.php
  45. 22
      httpdocs/src/Controller/Api/PreguntasApiController.php
  46. 4
      httpdocs/src/Controller/ChatController.php
  47. 6
      httpdocs/src/Controller/RegistrationFinancialActorController.php
  48. 4
      httpdocs/src/Controller/RegistrationGreenEnterpreneurController.php
  49. 6
      httpdocs/src/Controller/RegistrationTrainerController.php
  50. 2
      httpdocs/src/Controller/TareaErrorController.php
  51. 0
      httpdocs/src/Entity/.gitignore
  52. 8
      httpdocs/src/Entity/Bookmarks.php
  53. 6
      httpdocs/src/Entity/BussinessStage.php
  54. 6
      httpdocs/src/Entity/Comentarios.php
  55. 12
      httpdocs/src/Entity/Contable.php
  56. 8
      httpdocs/src/Entity/Convocatoria.php
  57. 6
      httpdocs/src/Entity/Encuesta.php
  58. 8
      httpdocs/src/Entity/Goal.php
  59. 6
      httpdocs/src/Entity/Inscripcion.php
  60. 18
      httpdocs/src/Entity/Licitador.php
  61. 2
      httpdocs/src/Entity/Preguntas.php
  62. 2
      httpdocs/src/Entity/PreguntasFormulario.php
  63. 6
      httpdocs/src/Entity/ProcesoGreenEnterpreneur.php
  64. 6
      httpdocs/src/Entity/Respuestas.php
  65. 6
      httpdocs/src/Entity/RespuestasFormulario.php
  66. 14
      httpdocs/src/Entity/Sector.php
  67. 12
      httpdocs/src/Entity/Servicio.php
  68. 10
      httpdocs/src/Entity/Supervisor.php
  69. 6
      httpdocs/src/Entity/TareaGreenEnterpreneur.php
  70. 6
      httpdocs/src/Entity/User.php
  71. 16
      httpdocs/src/Entity/WorkShop.php
  72. 6
      httpdocs/src/Form/Type/RegistrationFinancialActorFormType.php
  73. 4
      httpdocs/src/Form/Type/RegistrationGreenEnterpreneurFormType.php
  74. 4
      httpdocs/src/Form/Type/RegistrationTrainerFormType.php
  75. 2
      httpdocs/src/Repository/FinancialActorRepository.php
  76. 4
      httpdocs/src/Repository/GreenEntrepreneurRepository.php
  77. 2
      httpdocs/src/Resources/SonataAdminBundle/views/CRUD/list__action_share_files.html.twig
  78. 2
      httpdocs/src/Resources/SonataAdminBundle/views/CRUD/list__action_view_files.html.twig
  79. 6
      httpdocs/src/Resources/views/formcomponents/datatable.html.twig
  80. 4
      httpdocs/src/Resources/views/formcomponents/repetible/range.html.twig
  81. 4
      httpdocs/src/Resources/views/formcomponents/repetible/text.html.twig
  82. 6
      httpdocs/src/Resources/views/formcomponents/text.html.twig
  83. 2
      httpdocs/src/RuleEngine/Conditions/PerfilesCondition.php
  84. 2
      httpdocs/src/RuleEngine/Conditions/RespuestasCondition.php
  85. 6
      httpdocs/templates/database/components/formcomponents/datatable.html.twig
  86. 6
      httpdocs/templates/database/components/formcomponents/text.html.twig

8
httpdocs/.idea/.gitignore

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/

8
httpdocs/.idea/httpdocs.iml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
httpdocs/.idea/modules.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/httpdocs.iml" filepath="$PROJECT_DIR$/.idea/httpdocs.iml" />
</modules>
</component>
</project>

4
httpdocs/.idea/php.xml

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
</project>

6
httpdocs/.idea/vcs.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

10
httpdocs/config/services.yaml

@ -77,18 +77,18 @@ services:
$translator: '@translator.default'
$mailer: '@mailer'
public: true
#Trainer
#Supervisor
fos_user.trainer.registration:
class: App\Form\Type\RegistrationTrainerFormType
arguments:
$class: "Trainer"
$class: "Supervisor"
tags:
- { name: form.type, alias: fos_user_trainer_registration}
public: true
fos_user.registration.form.trainer.factory:
class: FOS\UserBundle\Form\Factory\FormFactory
arguments:
$name: Trainer
$name: Supervisor
$type: App\Form\Type\RegistrationTrainerFormType
public: true
App\Controller\RegistrationTrainerController:
@ -100,14 +100,14 @@ services:
fos_user.financialactor.registration:
class: App\Form\Type\RegistrationTrainerFormType
arguments:
$class: "FinancialActor"
$class: "Contable"
tags:
- { name: form.type, alias: fos_user_financialactor_registration}
public: true
fos_user.registration.form.financialactor.factory:
class: FOS\UserBundle\Form\Factory\FormFactory
arguments:
$name: FinancialActor
$name: Contable
$type: App\Form\Type\RegistrationFinancialActorFormType
public: true
App\Controller\RegistrationFinancialActorController:

6
httpdocs/config/services/admin.yaml

@ -246,7 +246,7 @@ services:
class: App\Admin\TrainerAdmin
arguments: [~, App\Entity\Trainer, App\Controller\Admin\TrainerAdminController]
tags:
- { name: sonata.admin, manager_type: orm, group: admin, label: Trainer }
- { name: sonata.admin, manager_type: orm, group: admin, label: Supervisor }
public: true
calls:
- [ setUserManager, [ "@fos_user.user_manager" ] ]
@ -256,7 +256,7 @@ services:
class: App\Admin\FinancialActorAdmin
arguments: [~, App\Entity\FinancialActor, App\Controller\Admin\FinancialActorAdminController, "@security.token_storage" ]
tags:
- { name: sonata.admin, manager_type: orm, group: admin, label: FinancialActor }
- { name: sonata.admin, manager_type: orm, group: admin, label: Contable }
public: true
calls:
- [ setUserManager, [ "@fos_user.user_manager" ] ]
@ -265,7 +265,7 @@ services:
class: App\Admin\GreenEntrepreneurAdmin
arguments: [~, App\Entity\GreenEntrepreneur, App\Controller\Admin\GreenEntrepreneurAdminController]
tags:
- { name: sonata.admin, manager_type: orm, group: admin, label: GreenEntrepreneur }
- { name: sonata.admin, manager_type: orm, group: admin, label: Licitador }
public: true
calls:
- [ setUserManager, [ "@fos_user.user_manager" ] ]

10
httpdocs/config/services/registrations.yaml

@ -17,18 +17,18 @@ services:
arguments:
$formFactory: '@fos_user.registration.form.bso.factory'
public: true
#Trainer
#Supervisor
fos_user.trainer.registration:
class: App\Form\Type\RegistrationTrainerFormType
arguments:
$class: "Trainer"
$class: "Supervisor"
tags:
- { name: form.type, alias: fos_user_trainer_registration}
public: true
fos_user.registration.form.trainer.factory:
class: FOS\UserBundle\Form\Factory\FormFactory
arguments:
$name: Trainer
$name: Supervisor
$type: App\Form\Type\RegistrationTrainerFormType
public: true
App\Controller\RegistrationTrainerController:
@ -39,14 +39,14 @@ services:
fos_user.financialactor.registration:
class: App\Form\Type\RegistrationTrainerFormType
arguments:
$class: "FinancialActor"
$class: "Contable"
tags:
- { name: form.type, alias: fos_user_financialactor_registration}
public: true
fos_user.registration.form.financialactor.factory:
class: FOS\UserBundle\Form\Factory\FormFactory
arguments:
$name: FinancialActor
$name: Contable
$type: App\Form\Type\RegistrationFinancialActorFormType
public: true
App\Controller\RegistrationFinancialActorController:

6
httpdocs/config/validator/validator.yaml

@ -10,7 +10,7 @@
# - Email: ~
# emailCanonical:
# - Email: ~
#App\Entity\FinancialActor:
#App\Entity\Contable:
# constraints:
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: email, message: "This email has already been registered"}
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: username, message: "This username has already been registered"}
@ -32,7 +32,7 @@
# - Email: ~
# username:
# - NotBlank: ~
#App\Entity\GreenEntrepreneur:
#App\Entity\Licitador:
# constraints:
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: email, message: "This email has already been registered"}
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: username, message: "This username has already been registered"}
@ -43,7 +43,7 @@
# - Email: ~
# username:
# - NotBlank: ~
#App\Entity\Trainer:
#App\Entity\Supervisor:
# constraints:
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: email, message: "This email has already been registered"}
# - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: { fields: username, message: "This username has already been registered"}

2
httpdocs/repositories/rule-engine-bundle-acdr/Command/ActionProcessorCommand.php

@ -73,7 +73,7 @@
{
//Get EntityManager
$this->output=$output;
$this->usuario = $this->em->getRepository('App:GreenEntrepreneur')
$this->usuario = $this->em->getRepository('App:Licitador')
->findOneById($input->getArgument('userid'));
if(empty($this->usuario)){

8
httpdocs/repositories/rule-engine-bundle-acdr/Command/FAImporterCommand.php

@ -7,7 +7,7 @@
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\EntityManagerInterface;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\IOFactory;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@ -106,7 +106,7 @@
}
if(empty($repetido)){
$repetido=$this->em->getRepository('App:FinancialActor')->findOneByEmail('rep'.$data['email']);
$repetido=$this->em->getRepository('App:Contable')->findOneByEmail('rep'.$data['email']);
if(!empty($repetido)){
$data['email']='rep'.$data['email'];
}
@ -116,7 +116,7 @@
$repetidoUser=$this->em->getRepository('App:User')->findOneByEmail($data['email']);
$repetidoUser2=$this->em->getRepository('App:User')->findOneByEmail('rep'.$data['email']);
echo 'No Repetido';
$user=new FinancialActor();
$user=new Contable();
$parts = explode("@", $data['email']);
$data['email']=$data['email'];
$data['username']=$data['email'];
@ -129,7 +129,7 @@
$this->updateUser($user, $data);
}else{
if (empty($repetido)){
$repetido=new FinancialActor();
$repetido=new Contable();
}
$parts = explode("@", $data['email']);
$data['username']=$data['email'];

2
httpdocs/repositories/rule-engine-bundle-acdr/Command/FillTranslationCommand.php

@ -9,7 +9,7 @@
use Symfony\Component\PropertyAccess\PropertyAccess;
use Doctrine\ORM\EntityManagerInterface;
// use Doctrine\Common\Annotations\Reader;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\IOFactory;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;

6
httpdocs/repositories/rule-engine-bundle-acdr/Command/GEImporterCommand.php

@ -7,7 +7,7 @@
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\EntityManagerInterface;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\IOFactory;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@ -87,9 +87,9 @@
}
$data['sector']=$this->getSector($geuser[6]);
$data['email']=$geuser[10];
$repetido=$this->em->getRepository('App:GreenEntrepreneur')->findByEmail($data['email']);
$repetido=$this->em->getRepository('App:Licitador')->findByEmail($data['email']);
if($this->checkemail($data['email']) && empty($repetido)){
$user=new GreenEntrepreneur();
$user=new Licitador();
$parts = explode("@", $data['email']);
$data['username']=$data['email'];
$data['plainPassword']=$parts[0];

2
httpdocs/repositories/rule-engine-bundle-acdr/Command/NormalizeTranslationsCommand.php

@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\EntityManagerInterface;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\IOFactory;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;

4
httpdocs/src/Admin/FinancialActorAdmin.php → httpdocs/src/Admin/ContableAdmin.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Admin;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use FM\ElfinderBundle\Form\Type\ElFinderType;
use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
@ -32,7 +32,7 @@ use Vich\UploaderBundle\Form\Type\VichImageType;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
final class FinancialActorAdmin extends UserAdmin
final class ContableAdmin extends UserAdmin
{
private $tokenStorage;

8
httpdocs/src/Admin/ContactsAdmin.php

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace App\Admin;
use App\Entity\FinancialActor;
use App\Entity\GreenEntrepreneur;
use App\Entity\Contable;
use App\Entity\Licitador;
use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper;
@ -79,12 +79,12 @@ final class ContactsAdmin extends AbstractAdmin
]
];
$current_user = $this->getConfigurationPool()->getContainer()->get('security.token_storage')->getToken()->getUser();
if($current_user instanceof GreenEntrepreneur){
if($current_user instanceof Licitador){
$actions['shareFiles'] = [
'template' => '@SonataAdmin/CRUD/list__action_share_files.html.twig'
];
}
if($current_user instanceof FinancialActor){
if($current_user instanceof Contable){
$actions['viewFiles'] = [
'template' => '@SonataAdmin/CRUD/list__action_view_files.html.twig'
];

6
httpdocs/src/Admin/ConvocatoriaAdmin.php

@ -6,7 +6,7 @@ namespace App\Admin;
use App\Entity\Convocatoria;
use App\Entity\Formulario;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Procesos;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query\ResultSetMapping;
@ -239,7 +239,7 @@ final class ConvocatoriaAdmin extends AbstractAdmin
->setParameter('user', $current_user);
}elseif( $authChecker->isGranted('ROLE_GREENENTERPRENEUR')) {
$qb1 = $this->getModelManager()
->createQuery(GreenEntrepreneur::class, 'ge')
->createQuery(Licitador::class, 'ge')
->join('ge.convocatoria', 'gec')
->select("COUNT(ge.id)")
->where('gec = '.$alias);
@ -352,7 +352,7 @@ final class ConvocatoriaAdmin extends AbstractAdmin
)
->add('greenEntrepreneur',EntityType::class,
array(
'class' => GreenEntrepreneur::class,
'class' => Licitador::class,
'choice_label' => 'nombreCompleto',
'query_builder' => function (EntityRepository $er) {
return

8
httpdocs/src/Admin/GreenEntrepreneurAdmin.php → httpdocs/src/Admin/LicitadorAdmin.php

@ -6,8 +6,8 @@ namespace App\Admin;
use App\Entity\Bso;
use App\Entity\BussinessStage;
use App\Entity\FinancialActor;
use App\Entity\GreenEntrepreneur;
use App\Entity\Contable;
use App\Entity\Licitador;
use App\Entity\Sector;
use Doctrine\ORM\Query\Expr\Join;
use Sonata\AdminBundle\Admin\AbstractAdmin;
@ -33,7 +33,7 @@ use Vich\UploaderBundle\Form\Type\VichImageType;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Sonata\DoctrineORMAdminBundle\Filter\DateRangeFilter;
final class GreenEntrepreneurAdmin extends UserAdmin
final class LicitadorAdmin extends UserAdmin
{
private $isDashboard = false;
@ -163,7 +163,7 @@ final class GreenEntrepreneurAdmin extends UserAdmin
$query->expr()->eq('gec.bso', ':user')
)
->setParameter('user', $current_user);
}else if ($current_user instanceof FinancialActor && $this->isDashboard){
}else if ($current_user instanceof Contable && $this->isDashboard){
$query->orWhere("0=1");
}else if ($current_user->getType() == 'trainer') {
$query

2
httpdocs/src/Admin/BsoAdmin.php → httpdocs/src/Admin/ServicioAdmin.php

@ -21,7 +21,7 @@ use Symfony\Component\Form\Extension\Core\Type\TelType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Vich\UploaderBundle\Form\Type\VichImageType;
final class BsoAdmin extends UserAdmin
final class ServicioAdmin extends UserAdmin
{
public function getExportFields()

2
httpdocs/src/Admin/TrainerAdmin.php → httpdocs/src/Admin/SupervisorAdmin.php

@ -25,7 +25,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Vich\UploaderBundle\Form\Type\VichImageType;
final class TrainerAdmin extends UserAdmin
final class SupervisorAdmin extends UserAdmin
{
public function getExportFields()

12
httpdocs/src/Admin/WorkShopAdmin.php

@ -20,7 +20,7 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormEvent;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\FormEvents;
use Sonata\AdminBundle\Route\RouteCollection;
@ -191,7 +191,7 @@ final class WorkShopAdmin extends AbstractAdmin
{
$user = $this->getConfigurationPool()->getContainer()->get('security.token_storage')->getToken()->getUser();
$workshop = $this->getSubject();
$repo = $this->getModelManager()->getEntityManager(GreenEntrepreneur::class)->getRepository(GreenEntrepreneur::class);
$repo = $this->getModelManager()->getEntityManager(Licitador::class)->getRepository(Licitador::class);
$entrepreneurs=$repo->getFilteredEntrepreneursByConvocatoria($workshop->getConvocatoria(), $workshop->getProcesos());
foreach($workshop->getGreenEntrepreneur() as $empre){
$entrepreneurs[]=$empre;
@ -228,7 +228,7 @@ final class WorkShopAdmin extends AbstractAdmin
)
->add('trainer',EntityType::class,
array(
'class' => 'App\Entity\Trainer',
'class' => 'App\Entity\Supervisor',
'choice_label' => 'username',
'multiple'=> true,
'placeholder' => 'placeholder.select.trainer',
@ -241,7 +241,7 @@ final class WorkShopAdmin extends AbstractAdmin
)
->add('greenEntrepreneur',EntityType::class,
array(
'class' => 'App\Entity\GreenEntrepreneur',
'class' => 'App\Entity\Licitador',
'placeholder' => 'Seleccione los Emprendedores',
'attr' => ['class' => 'sel-entrepreneur'],
'choices'=>$entrepreneurs,
@ -283,9 +283,9 @@ final class WorkShopAdmin extends AbstractAdmin
}
if(array_key_exists('greenEntrepreneur', $data)){
$repo = $this->getModelManager();
$emprendedores = $repo->findBy(GreenEntrepreneur::class, ['id' => $data['greenEntrepreneur']]);
$emprendedores = $repo->findBy(Licitador::class, ['id' => $data['greenEntrepreneur']]);
$form->add('greenEntrepreneur',EntityType::class, [
'class' => 'App\Entity\GreenEntrepreneur',
'class' => 'App\Entity\Licitador',
'placeholder' => 'Seleccione los Emprendedores',
'attr' => ['class' => 'sel-entrepreneur'],
'choice_label' => 'nombreCompleto',

10
httpdocs/src/Blocks/StatsBlockService.php

@ -77,7 +77,7 @@ class StatsBlockService extends AbstractBlockService {
$qbfa = $this->em->createQueryBuilder();
$qbbso = $this->em->createQueryBuilder();
$qb->select('count(ge.id)');
$qb->from('App:GreenEntrepreneur','ge');
$qb->from('App:Licitador','ge');
$countEntrepreneurs = $qb->getQuery()->getSingleScalarResult();
$contadorge->valor=$countEntrepreneurs;
$contadorge->text='Entrepreneurs supported to develop their Sustainable Businesses';
@ -87,7 +87,7 @@ class StatsBlockService extends AbstractBlockService {
$contadorwge=new \stdClass();
$qb = $this->em->createQueryBuilder();
$qb->select('count(ge.id)');
$qb->from('App:GreenEntrepreneur','ge');
$qb->from('App:Licitador','ge');
$qb->where("ge.gender = 'f'");
$countWomenEntrepreneurs = $qb->getQuery()->getSingleScalarResult();
$contadorwge->valor=($countWomenEntrepreneurs/$countEntrepreneurs)*100;
@ -97,10 +97,10 @@ class StatsBlockService extends AbstractBlockService {
$contadortr=new \stdClass();
$qb = $this->em->createQueryBuilder();
$qb->select('count(tr.id)');
$qb->from('App:Trainer','tr');
$qb->from('App:Supervisor','tr');
$countTrainers = $qb->getQuery()->getSingleScalarResult();
$contadortr->valor=$countTrainers;
$contadortr->text='Trainer Mentors trained in Sustainable Business Model Development';
$contadortr->text='Supervisor Mentors trained in Sustainable Business Model Development';
$stats->add($contadortr);
//BSOS
$contadorbso=new \stdClass();
@ -113,7 +113,7 @@ class StatsBlockService extends AbstractBlockService {
//Financial Actors
$contadorfa=new \stdClass();
$qbfa->select('count(fa.id)');
$qbfa->from('App:FinancialActor','fa');
$qbfa->from('App:Contable','fa');
$countfa = $qbfa->getQuery()->getSingleScalarResult();
$contadorfa->valor=$countfa;
$contadorfa->text='Sources of financing available in our database';

4
httpdocs/src/Blocks/TrainerClassesBlock.php

@ -2,7 +2,7 @@
namespace App\Blocks;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Mensaje;
use App\Entity\Procesos;
use App\Entity\Respuestas;
@ -106,7 +106,7 @@ class TrainerClassesBlock extends AbstractBlockService {
return $this->response($blockContext, $response);
}// endif
$userId = $request->query->get('userId');
$alumno = $this->em->getReference(GreenEntrepreneur::class, $userId);
$alumno = $this->em->getReference(Licitador::class, $userId);
/*
* Si el aluno es nulo o el usuario logado no pertenece al workshop cargamos la vista inicial
* del dashboard

10
httpdocs/src/Controller/Admin/CalendarAdminController.php

@ -3,8 +3,8 @@
namespace App\Controller\Admin;
use App\Entity\Calendario;
use App\Entity\GreenEntrepreneur;
use App\Entity\Trainer;
use App\Entity\Licitador;
use App\Entity\Supervisor;
use App\Entity\User;
use App\Entity\WorkShop;
use Sonata\AdminBundle\Controller\CRUDController;
@ -49,11 +49,11 @@ class CalendarAdminController extends CRUDController
$calendarRepo = $this->getDoctrine()->getRepository(Calendario::class);
$logedInUser = $this->getUser();
if($logedInUser instanceof GreenEntrepreneur){
if($logedInUser instanceof Licitador){
$events = $calendarRepo->findEventsByUSer($logedInUser, true);
return new JsonResponse($events);
}
if($logedInUser instanceof Trainer){
if($logedInUser instanceof Supervisor){
$events = $calendarRepo->findEventsByUSer($logedInUser, true);
return new JsonResponse($events);
}
@ -81,7 +81,7 @@ class CalendarAdminController extends CRUDController
}
private function loggedUserCanSeeUserEvents($logedInUser, $user, $class){
if(!$logedInUser instanceof Trainer){
if(!$logedInUser instanceof Supervisor){
return false;
}
if($logedInUser->getWorkShop()->contains($class) && $user->getWorkshop()->contains($class)){

6
httpdocs/src/Controller/Admin/FinancialActorAdminController.php → httpdocs/src/Controller/Admin/ContableAdminController.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use HttpInvalidParamException;
use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Component\HttpFoundation\JsonResponse;
@ -14,7 +14,7 @@ use Symfony\Component\Intl\Countries;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
final class FinancialActorAdminController extends CRUDController
final class ContableAdminController extends CRUDController
{
/**
@ -74,7 +74,7 @@ final class FinancialActorAdminController extends CRUDController
$country = $request->query->get('country');
$stage = $request->query->get('stage');
$financialRepo = $this->getDoctrine()->getRepository(FinancialActor::class);
$financialRepo = $this->getDoctrine()->getRepository(Contable::class);
$financialActors = $financialRepo->findByCountryAndInvestmentScopes($country, $stage);

10
httpdocs/src/Controller/Admin/ContadorAdminController.php

@ -32,7 +32,7 @@ final class ContadorAdminController extends CRUDController
$qbfa = $em->createQueryBuilder();
$qbbso = $em->createQueryBuilder();
$qbge->select('count(ge.id)');
$qbge->from('App:GreenEntrepreneur','ge');
$qbge->from('App:Licitador','ge');
$countEntrepreneurs = $qbge->getQuery()->getSingleScalarResult();
$contadorge->setCount($countEntrepreneurs);
$contadorge->setText('Entrepreneurs supported to develop their Sustainable Businesses');
@ -41,7 +41,7 @@ final class ContadorAdminController extends CRUDController
//Porcentaje de mujeres
$contadorwge=new Contador;
$qbwge->select('count(ge.id)');
$qbwge->from('App:GreenEntrepreneur','ge');
$qbwge->from('App:Licitador','ge');
$qbwge->where("ge.gender = 'f'");
$countWomenEntrepreneurs = $qbwge->getQuery()->getSingleScalarResult();
$contadorwge->setCount(($countWomenEntrepreneurs/$countEntrepreneurs)*100);
@ -50,10 +50,10 @@ final class ContadorAdminController extends CRUDController
//Trainers
$contadortr=new Contador;
$qb->select('count(tr.id)');
$qb->from('App:Trainer','tr');
$qb->from('App:Supervisor','tr');
$countTrainers = $qb->getQuery()->getSingleScalarResult();
$contadortr->setCount($countTrainers);
$contadortr->setText('Trainer Mentors trained in Sustainable Business Model Development');
$contadortr->setText('Supervisor Mentors trained in Sustainable Business Model Development');
$results[]=$contadortr;
//BSOS
$contadorbso=new Contador;
@ -66,7 +66,7 @@ final class ContadorAdminController extends CRUDController
//Financial Actors
$contadorfa=new Contador;
$qbfa->select('count(fa.id)');
$qbfa->from('App:FinancialActor','fa');
$qbfa->from('App:Contable','fa');
$countfa = $qbfa->getQuery()->getSingleScalarResult();
$contadorfa->setCount($countfa);
$contadorfa->setText('Sources of financing available in our database');

2
httpdocs/src/Controller/Admin/DashboardAdminController.php

@ -85,7 +85,7 @@ final class DashboardAdminController extends CRUDController
}
// die(print_r($data));
$em = $this->getDoctrine()->getManager();
$trainers = $em->getRepository('App:Trainer')
$trainers = $em->getRepository('App:Supervisor')
->findAll();
$convocatorias = $em->getRepository('App:Convocatoria')
->findAll();

4
httpdocs/src/Controller/Admin/EncuestaAdminController.php

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\Convocatoria;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Inscripcion;
use App\Entity\RespuestasFormulario;
use Sonata\AdminBundle\Controller\CRUDController;
@ -213,7 +213,7 @@ final class EncuestaAdminController extends CRUDController
$request = $this->getRequest();
$id = $request->get($this->admin->getIdParameter());
$userCall=explode('~',$id);
$user=$this->getDoctrine()->getRepository(GreenEntrepreneur::class)->findOneById($userCall[1]);
$user=$this->getDoctrine()->getRepository(Licitador::class)->findOneById($userCall[1]);
$convocatoria=$this->getDoctrine()->getRepository(Convocatoria::class)->findOneById($userCall[0]);
$inscripcion = $this->getDoctrine()->getRepository(Inscripcion::class)
->findOneBy(['greenEntrepreneur' => $user, 'convocatoria'=>$convocatoria]);

4
httpdocs/src/Controller/Admin/FormularioAdminController.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Tarea;
use App\Entity\WorkShop;
use Pix\SortableBehaviorBundle\Services\PositionHandler;
@ -427,7 +427,7 @@ final class FormularioAdminController extends CRUDController
return $errorResponse;
}// endif
$userId = $request->query->get('userId');
$alumno = $em->getReference(GreenEntrepreneur::class, $userId);
$alumno = $em->getReference(Licitador::class, $userId);
/*
* Si el aluno es nulo o el usuario logado no pertenece al workshop cargamos la vista inicial
* del dashboard

2
httpdocs/src/Controller/Admin/IndicadorAdminController.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Tarea;
use App\Entity\WorkShop;
use Pix\SortableBehaviorBundle\Services\PositionHandler;

18
httpdocs/src/Controller/Admin/GreenEntrepreneurAdminController.php → httpdocs/src/Controller/Admin/LicitadorAdminController.php

@ -5,9 +5,9 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Controller\ChatController;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use App\Entity\Bso;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Sala;
use App\Entity\SalaLastAccess;
use App\Entity\Tarea;
@ -24,7 +24,7 @@ use Symfony\Component\Intl\Countries;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\HttpFoundation\Request;
final class GreenEntrepreneurAdminController extends CRUDController
final class LicitadorAdminController extends CRUDController
{
private $chatController;
@ -106,12 +106,12 @@ final class GreenEntrepreneurAdminController extends CRUDController
public function contactarAjaxAction($id){
$user = $this->getUser();
if(!($user instanceof FinancialActor) && !($user instanceof Bso)){
if(!($user instanceof Contable) && !($user instanceof Bso)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getReference(User::class, $id);
if(!($ge instanceof GreenEntrepreneur)){
if(!($ge instanceof Licitador)){
throw new AccessDeniedHttpException();
}
$sala = new Sala();
@ -146,12 +146,12 @@ return new RedirectResponse($this->generateUrl('sonata_admin_dashboard'));
throw new AccessDeniedHttpException();
}
$user = $this->getUser();
if(!($user instanceof GreenEntrepreneur)){
if(!($user instanceof Licitador)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$fa = $em->getReference(User::class, $id);
if(!($fa instanceof FinancialActor) or !($fa instanceof Bso)){
if(!($fa instanceof Contable) or !($fa instanceof Bso)){
throw new AccessDeniedHttpException();
}
$user->addFinancial($fa);
@ -170,12 +170,12 @@ return new RedirectResponse($this->generateUrl('sonata_admin_dashboard'));
throw new AccessDeniedHttpException();
}
$user = $this->getUser();
if(!($user instanceof FinancialActor)){
if(!($user instanceof Contable)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getReference(User::class, $id);
if(!($ge instanceof GreenEntrepreneur)){
if(!($ge instanceof Licitador)){
throw new AccessDeniedHttpException();
}
$achievements = new ArrayCollection();

6
httpdocs/src/Controller/Admin/ProcesoTareaAdminController.php

@ -2,7 +2,7 @@
namespace App\Controller\Admin;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Procesos;
use App\Entity\Respuestas;
use App\Entity\Tarea;
@ -90,7 +90,7 @@
$tareas = $proceso->getTarea();
// the key used to lookup the template
$templateKey = 'edit';
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
// Mapeamos las Preguntas de la Tarea
foreach($tareas as $tarea){
@ -141,7 +141,7 @@
{
$request = $this->getRequest();
$user = $this->getUser();
if(!$request->isXmlHttpRequest() || !$user || !($user instanceof GreenEntrepreneur)){
if(!$request->isXmlHttpRequest() || !$user || !($user instanceof Licitador)){
throw new AccessDeniedHttpException();
}
$procesoId = $request->query->get('proceso_id');

10
httpdocs/src/Controller/Admin/RealizarTareaAdminController.php

@ -77,7 +77,7 @@
$getvars['modal']=$modal;
}
$em = $this->getDoctrine()->getManager();
$userCasoEstudio=$em->getRepository('App:GreenEntrepreneur')
$userCasoEstudio=$em->getRepository('App:Licitador')
->findOneByUsername('caso_estudio_'.$this->get('request_stack')->getCurrentRequest()->getLocale());
@ -99,7 +99,7 @@
->findBy(['preguntas'=>$mapPreguntas, 'greenEntrepreneur'=> $userCasoEstudio->getId()]);
}
$user=$em->getRepository('App:GreenEntrepreneur')
$user=$em->getRepository('App:Licitador')
->findOneById($userge);
if($tarea[0]->getPrecondition()) {
try{
@ -129,7 +129,7 @@
$respuestas=null;
$respuestasArray=null;
}
/** @var \App\Entity\Trainer $trainer */
/** @var \App\Entity\Supervisor $trainer */
$trainer = $this->getUser();
$comentarios=[];
$reviewed=[];
@ -177,7 +177,7 @@
$getvars=$this->getRequest()->query->all();
$em = $this->getDoctrine()->getManager();
$userCasoEstudio=$em->getRepository('App:GreenEntrepreneur')
$userCasoEstudio=$em->getRepository('App:Licitador')
->findOneByUsername('caso_estudio_'.$this->get('request_stack')->getCurrentRequest()->getLocale());
$tarea = $em->getRepository('App:Tarea')
->findById($id);
@ -195,7 +195,7 @@
$respuestasCasoEstudio = $em->getRepository('App:Respuestas')
->findBy(['preguntas'=>$mapPreguntas, 'greenEntrepreneur'=> $userCasoEstudio->getId()]);
}
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if($user->getType()=='green_entrepreneur'){

2
httpdocs/src/Controller/Admin/RespuestasFormularioAdminController.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Tarea;
use App\Entity\WorkShop;
use Pix\SortableBehaviorBundle\Services\PositionHandler;

4
httpdocs/src/Controller/Admin/RespuestasTareaAdminController.php

@ -83,7 +83,7 @@ class RespuestasTareaAdminController extends CRUDController
}
//die('Llega hasta desvio'.print_r($request->request->get('ge')));
$ge = $em->getRepository('App:GreenEntrepreneur')->findOneById([$request->request->get('ge')]);
$ge = $em->getRepository('App:Licitador')->findOneById([$request->request->get('ge')]);
$tareasRealizadas = $em->getRepository('App:TareaGreenEnterpreneur')
->findBy(['greenEntrepreneur'=> $ge]);
$sendMessage = $this->trainerSaveOnly($preguntas, $request, $ge, $em);
@ -258,7 +258,7 @@ class RespuestasTareaAdminController extends CRUDController
$tarea = $em->getRepository('App:Tarea')
->findById($id);
$preguntas = $tarea[0]->getPreguntasId();
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
switch ($user->getType()) {
case 'trainer':

2
httpdocs/src/Controller/Admin/BsoAdminController.php → httpdocs/src/Controller/Admin/ServicioAdminController.php

@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Intl\Countries;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\HttpFoundation\RedirectResponse;
final class BsoAdminController extends IsOwnerCRUDController
final class ServicioAdminController extends IsOwnerCRUDController
{
/* public function deleteAction($id) {

14
httpdocs/src/Controller/Admin/TrainerAdminController.php → httpdocs/src/Controller/Admin/SupervisorAdminController.php

@ -5,9 +5,9 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Controller\ChatController;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use App\Entity\Bso;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Sala;
use App\Entity\SalaLastAccess;
use App\Entity\Tarea;
@ -24,7 +24,7 @@ use Symfony\Component\Intl\Countries;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\HttpFoundation\Request;
final class TrainerAdminController extends CRUDController
final class SupervisorAdminController extends CRUDController
{
private $chatController;
@ -79,14 +79,14 @@ final class TrainerAdminController extends CRUDController
}
public function contactarAjaxAction($id){
$user = $this->getUser();
if(!($user instanceof FinancialActor) && !($user instanceof Bso)){
if(!($user instanceof Contable) && !($user instanceof Bso)){
die("not instance of Bso");
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getReference(User::class, $id);
if($ge->getType()!=='trainer'){
die("not instance of Trainer".$ge->getType());
die("not instance of Supervisor".$ge->getType());
throw new AccessDeniedHttpException();
}
$sala = new Sala();
@ -122,12 +122,12 @@ final class TrainerAdminController extends CRUDController
throw new AccessDeniedHttpException();
}
$user = $this->getUser();
if(!($user instanceof GreenEntrepreneur)){
if(!($user instanceof Licitador)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$fa = $em->getReference(User::class, $id);
if(!($fa instanceof FinancialActor)){
if(!($fa instanceof Contable)){
throw new AccessDeniedHttpException();
}
$user->addFinancial($fa);

4
httpdocs/src/Controller/Admin/TareaAdminController.php

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Tarea;
use App\Entity\WorkShop;
use Pix\SortableBehaviorBundle\Services\PositionHandler;
@ -401,7 +401,7 @@ final class TareaAdminController extends CRUDController
return $errorResponse;
}// endif
$userId = $request->query->get('userId');
$alumno = $em->getReference(GreenEntrepreneur::class, $userId);
$alumno = $em->getReference(Licitador::class, $userId);
/*
* Si el aluno es nulo o el usuario logado no pertenece al workshop cargamos la vista inicial
* del dashboard

79
httpdocs/src/Controller/Admin/TrainerAdminController.php.save

@ -1,79 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Controller\Admin;
use App\Controller\ChatController;
use App\Entity\FinancialActor;
use App\Entity\Bso;
use App\Entity\GreenEntrepreneur;
use App\Entity\Sala;
use App\Entity\SalaLastAccess;
use App\Entity\Tarea;
use App\Entity\User;
use Doctrine\Common\Collections\ArrayCollection;
use phpDocumentor\Reflection\Types\Object_;
use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
final class TrainerAdminController extends CRUDController
{
public function contactarAjaxAction($id){
$user = $this->getUser();
if(!($user instanceof FinancialActor) && !($user instanceof Bso)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getReference(Trainer::class, $id);
if(!($ge instanceof Trainer)){
throw new AccessDeniedHttpException();
}
$sala = new Sala();
$sala->addUser($user);
$sala->addUser($ge);
$sala->setDenominacion('Contacto');
$lastAccess = new SalaLastAccess();
$lastAccess->setSala($sala);
$lastAccess->setUser($ge);
$lastAccess->setLastAccess(new \DateTime("1970-01-01"));
$em->persist($lastAccess);
$sala->addSalaLastAccess($lastAccess);
$em->persist($sala);
$ge->addContacto($user);
$user->addContacto($ge);
$em->persist($ge);
$em->persist($user);
$em->flush();
$route = $this->generateUrl('admin_app_trainer_giveAccessToFiles', ['id'=> $user->getId()]);
$message = "A financial actor would like to talk to you.<br><a href=\"{$route}\">Give access to files</a>";
$this->chatController->publishMessage($message, $user, $sala);
return new JsonResponse("success", 200);
}
public function giveAccessToFilesAction($id){
if(!$this->isXmlHttpRequest()){
throw new AccessDeniedHttpException();
}
$user = $this->getUser();
if(!($user instanceof Trainer)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$fa = $em->getReference(User::class, $id);
if(!($fa instanceof FinancialActor)){
throw new AccessDeniedHttpException();
}
$user->addFinancial($fa);
$em->persist($user);
$em->flush();
$modalBody = "You have successfully shared your documents with ".$fa->getNombreCompleto();
$modalTitle = "Congratulations!!!";
return $this->renderWithExtraParams('listajaxactions/modal_content.html.twig', [
'modalTitle' => $modalTitle,
'modalBody' => $modalBody,
], null);
}
}

91
httpdocs/src/Controller/Admin/TrainerAdminController.php.save.1

@ -1,91 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Controller\Admin;
use App\Controller\ChatController;
use App\Entity\FinancialActor;
use App\Entity\Bso;
use App\Entity\GreenEntrepreneur;
use App\Entity\Sala;
use App\Entity\SalaLastAccess;
use App\Entity\Tarea;
use App\Entity\User;
use Doctrine\Common\Collections\ArrayCollection;
use phpDocumentor\Reflection\Types\Object_;
use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpFoundation\RedirectResponse;
final class TrainerAdminController extends CRUDController
{
private $chatController;
public function __construct(ChatController $chatController)
{
$this->chatController = $chatController;
}
public function contactarAjaxAction($id){
$user = $this->getUser();
if(!($user instanceof FinancialActor) && !($user instanceof Bso)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getReference(User::class, $id);
if(!($ge instanceof Trainer)){
throw new AccessDeniedHttpException();
}
$sala = new Sala();
$sala->addUser($user);
$sala->addUser($ge);
$sala->setDenominacion('Contacto');
$lastAccess = new SalaLastAccess();
$lastAccess->setSala($sala);
$lastAccess->setUser($ge);
$lastAccess->setLastAccess(new \DateTime("1970-01-01"));
$em->persist($lastAccess);
$sala->addSalaLastAccess($lastAccess);
$em->persist($sala);
$ge->addContacto($user);
$user->addContacto($ge);
$em->persist($ge);
$em->persist($user);
$em->flush();
$route = $this->generateUrl('admin_app_trainer_giveAccessToFiles', ['id'=> $user->getId()]);
$message = "A financial actor would like to talk to you.<br><a href=\"{$route}\">Give access to files</a>";
$message = "A financial actor would like to talk to you.<br><a href=\"{$route}\">Give access to files</a>";
$this->chatController->publishMessage($message, $user, $sala);
return new RedirectResponse($this->generateUrl('sonata_admin_dashboard'));
return new JsonResponse("success", 200);
}
public function giveAccessToFilesAction($id){
if(!$this->isXmlHttpRequest()){
throw new AccessDeniedHttpException();
}
$user = $this->getUser();
if(!($user instanceof GreenEntrepreneur)){
throw new AccessDeniedHttpException();
}
$em = $this->getDoctrine()->getManager();
$fa = $em->getReference(User::class, $id);
if(!($fa instanceof FinancialActor)){
throw new AccessDeniedHttpException();
}
$user->addFinancial($fa);
$em->persist($user);
$em->flush();
$modalBody = "You have successfully shared your documents with ".$fa->getNombreCompleto();
$modalTitle = "Congratulations!!!";
return $this->renderWithExtraParams('listajaxactions/modal_content.html.twig', [
'modalTitle' => $modalTitle,
'modalBody' => $modalBody,
], null);
}
}

4
httpdocs/src/Controller/Admin/WorkShopsAdminController.php

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace App\Controller\Admin;
use App\Entity\Convocatoria;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Procesos;
use App\Twig\Extension\JsonDecode;
use phpDocumentor\Reflection\DocBlock\Serializer;
@ -67,7 +67,7 @@ final class WorkShopsAdminController extends IsOwnerCRUDController
return new Response ($output);
}
try{
$entrepreneurs = $doctrine->getRepository(GreenEntrepreneur::class)
$entrepreneurs = $doctrine->getRepository(Licitador::class)
->findByConvocatoria($convocatoria, $proceso);
}catch(\Exception $e){
throw new BadRequestHttpException('Hay algún error en la petición');

6
httpdocs/src/Controller/Api/CountersApiController.php

@ -58,9 +58,9 @@ class CountersApiController extends AbstractController
// if(!$workshop){
// return new JsonResponse(["Error"=>"403: Unauthorized"],403);
// }
$trainer = $em->getRepository('App:Trainer')
$trainer = $em->getRepository('App:Supervisor')
->findOneBy(['id'=>$request->request->get('trainer')]);
if (empty($trainer) || !($trainer instanceof \App\Entity\Trainer) ){
if (empty($trainer) || !($trainer instanceof \App\Entity\Supervisor) ){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
@ -78,7 +78,7 @@ class CountersApiController extends AbstractController
}
}
foreach( $usuarios as $usuario){
$ge = $em->getRepository('App:GreenEntrepreneur')
$ge = $em->getRepository('App:Licitador')
->findOneBy(['id'=>$usuario]);
$evento = new Calendario();
$evento->setTitulo($titulo);

22
httpdocs/src/Controller/Api/GuardarTareaApiController.php

@ -5,7 +5,7 @@
use App\Controller\ChatController;
use App\Entity\Comentarios;
use App\Entity\ComentariosHistorico;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Respuestas;
use App\Entity\RespuestasHistoricas;
use App\Traits\SaveTasks;
@ -69,7 +69,7 @@ $this->translator = $translator;
$em = $this->getDoctrine()->getManager();
$tarea = $em->getRepository('App:Tarea')
->findOneById($id);
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user) ){
@ -81,7 +81,7 @@ $this->translator = $translator;
$res['error'] = 'Unidentified Green Entrepreneur';
return $this->renderWithExtraParams('admin/errorprecondition_view.html.twig', ['tarea' => $tarea, 'error' => $res['error']]);
}
$ge = $em->getRepository('App:GreenEntrepreneur')->findOneById([$request->request->get('ge')]);
$ge = $em->getRepository('App:Licitador')->findOneById([$request->request->get('ge')]);
$this->savetrainer($tarea, $request, $em, $ge);
break;
case 'green_entrepreneur':
@ -107,7 +107,7 @@ $this->translator = $translator;
->findOneBy(['hash'=>$hash]);
$user=$external->getGreenEntrepreneur();
$tarea=$external->getTarea();
if (empty($user) || !($user instanceof \App\Entity\GreenEntrepreneur) ){
if (empty($user) || !($user instanceof \App\Entity\Licitador) ){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$this->save($tarea, $request, $em, $user);
@ -129,7 +129,7 @@ $this->translator = $translator;
->findOneBy(['hash'=>$hash]);
$user=$external->getGreenEntrepreneur();
$tarea=$external->getTarea();
if (empty($user) || !($user instanceof \App\Entity\GreenEntrepreneur) ){
if (empty($user) || !($user instanceof \App\Entity\Licitador) ){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$preguntas = $tarea->getPreguntasId();
@ -213,15 +213,15 @@ $this->translator = $translator;
$pregunta=$em->getRepository('App:Preguntas')->findOneById((int)$id);
$template=$pregunta->getTarea()->getTemplateId()->getEmailfilename();
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
//Nos aseguramos que es un GreenEntrepreneur
//Nos aseguramos que es un Licitador
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}else{
$user=$em->getRepository('App:GreenEntrepreneur')->findOneById((int)$user->getId());
$user=$em->getRepository('App:Licitador')->findOneById((int)$user->getId());
if (empty($user)) {
return new JsonResponse(["Error" => "401: Unauthorized"], 401);
}
@ -342,11 +342,11 @@ $this->translator = $translator;
$template = 'financialtool/email-results.html.twig';
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
//Nos aseguramos que es un GreenEntrepreneur
if (empty($user) || !($user instanceof GreenEntrepreneur)){
//Nos aseguramos que es un Licitador
if (empty($user) || !($user instanceof Licitador)){
throw new AccessDeniedHttpException();
}

4
httpdocs/src/Controller/Api/GuardarTareaApiNonAdminController.php

@ -49,7 +49,7 @@
->findOneBy(['hash'=>$hash]);
$user=$external->getGreenEntrepreneur();
$tarea=$external->getTarea();
if (empty($user) || !($user instanceof \App\Entity\GreenEntrepreneur) ){
if (empty($user) || !($user instanceof \App\Entity\Licitador) ){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$this->save($tarea, $request, $em, $user);
@ -71,7 +71,7 @@
->findOneBy(['hash'=>$hash]);
$user=$external->getGreenEntrepreneur();
$tarea=$external->getTarea();
if (empty($user) || !($user instanceof \App\Entity\GreenEntrepreneur) ){
if (empty($user) || !($user instanceof \App\Entity\Licitador) ){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$preguntas = $tarea->getPreguntasId();

22
httpdocs/src/Controller/Api/PreguntasApiController.php

@ -14,7 +14,7 @@
use App\Entity\Indicador;
use App\Entity\Bookmarks;
use \App\Entity\Goal;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Respuestas;
use Symfony\Component\HttpFoundation\JsonResponse;
use Doctrine\ORM\Query\ResultSetMapping;
@ -38,7 +38,7 @@
*/
public function getPreguntasAction(Request $request)
{
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
@ -98,7 +98,7 @@
*/
public function getEmailAction(Request $request)
{
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
@ -136,7 +136,7 @@
*/
public function getTareasAction(Request $request )
{
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
@ -506,14 +506,14 @@
*@return Response
*/
public function toggleBookmark($userId, $indicadorId){
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$request = $this->requestStack->getCurrentRequest();
$em = $this->getDoctrine()->getManager();
$ge = $em->getRepository('App:GreenEntrepreneur')
$ge = $em->getRepository('App:Licitador')
->findOneById($userId);
$indicador = $em->getRepository('App:Indicador')
->findOneById($indicadorId);
@ -539,14 +539,14 @@
*@return Response
*/
public function toggleGoal($userId, $indicadorId){
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
}
$request = $this->requestStack->getCurrentRequest();
$em = $this->getDoctrine()->getManager();
$ge = $em->getRepository('App:GreenEntrepreneur')
$ge = $em->getRepository('App:Licitador')
->findOneById($userId);
$indicador = $em->getRepository('App:Indicador')
->findOneById($indicadorId);
@ -573,7 +573,7 @@
*@return Response
*/
public function addIndicator($userId){
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);
@ -583,7 +583,7 @@
return new JsonResponse(["Error"=>"400: Bad Request"],400);
}
$em = $this->getDoctrine()->getManager();
$ge = $em->getRepository('App:GreenEntrepreneur')
$ge = $em->getRepository('App:Licitador')
->findOneById($userId);
$indicador=new Indicador();
$indicador->setGenerico(false);
@ -602,7 +602,7 @@
*@return Response
*/
public function editGoal($goalId){
/** @var \App\Entity\GreenEntrepreneur $user */
/** @var \App\Entity\Licitador $user */
$user = $this->getUser();
if (empty($user)){
return new JsonResponse(["Error"=>"401: Unauthorized"],401);

4
httpdocs/src/Controller/ChatController.php

@ -7,14 +7,14 @@ namespace App\Controller;
use App\Entity\Calendario;
use App\Entity\Comentarios;
use App\Entity\Convocatoria;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Entity\Mensaje;
use App\Entity\Preguntas;
use App\Entity\Procesos;
use App\Entity\Respuestas;
use App\Entity\Sala;
use App\Entity\SalaLastAccess;
use App\Entity\Trainer;
use App\Entity\Supervisor;
use App\Entity\WorkShop;
use DateTime;
use Doctrine\ORM\EntityManagerInterface;

6
httpdocs/src/Controller/RegistrationFinancialActorController.php

@ -28,7 +28,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use FOS\UserBundle\Controller\RegistrationController;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use App\Kernel;
use Symfony\Contracts\Translation\TranslatorInterface;
@ -67,7 +67,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
*/
public function registerAction(Request $request)
{
$user = new FinancialActor();
$user = new Contable();
$user->setEnabled(false);
$event = new GetResponseUserEvent($user, $request);
@ -207,7 +207,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
private function updateUser($user, $request){
$em = $this->getDoctrine()->getManager();
$datos=$request->request->all();
$data=$datos['FinancialActor'];
$data=$datos['Contable'];
echo print_r($data,true);
//Contact Details
$user->setFirstname($data['register_usuario']['firstname']);

4
httpdocs/src/Controller/RegistrationGreenEnterpreneurController.php

@ -30,7 +30,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use FOS\UserBundle\Controller\RegistrationController;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use App\Kernel;
use Symfony\Contracts\Translation\TranslatorInterface;
@ -65,7 +65,7 @@ class RegistrationGreenEnterpreneurController extends Controller
*/
public function registerAction(Request $request)
{
$user = new GreenEntrepreneur();
$user = new Licitador();
$user->setEnabled(true);
$event = new GetResponseUserEvent($user, $request);

6
httpdocs/src/Controller/RegistrationTrainerController.php

@ -29,7 +29,7 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use FOS\UserBundle\Controller\RegistrationController;
use Doctrine\ORM\EntityManagerInterface;
use App\Entity\Trainer;
use App\Entity\Supervisor;
use App\Entity\Bso;
use App\Kernel;
use Symfony\Contracts\Translation\TranslatorInterface;
@ -68,7 +68,7 @@ class RegistrationTrainerController extends Controller
*/
public function registerAction(Request $request)
{
$user = new Trainer();
$user = new Supervisor();
$user->setEnabled(true);
$event = new GetResponseUserEvent($user, $request);
@ -210,7 +210,7 @@ class RegistrationTrainerController extends Controller
private function updateUser($user, $request){
$datos=$request->request->all();
$data=$datos['Trainer'];
$data=$datos['Supervisor'];
//echo print_r($data,true);
//Required Data
$user->setFirstname($data['datos_usuario']['firstname']);

2
httpdocs/src/Controller/TareaErrorController.php

@ -18,7 +18,7 @@ class TareaErrorController extends Controller
foreach($preguntas as $pregunta){
$mapPreguntas[]=$pregunta->getId();
}
$usuario = $em->getRepository('App:GreenEntrepreneur')
$usuario = $em->getRepository('App:Licitador')
->findById(13);
$respuestas = $em->getRepository('App:Respuestas')
->findBy(['preguntas'=>$mapPreguntas, 'greenEntrepreneur'=> $usuario[0]->getId()]);

0
httpdocs/src/Entity/.gitignore

8
httpdocs/src/Entity/Bookmarks.php

@ -3,7 +3,7 @@
namespace App\Entity;
use Doctrine\ORM\Mapping as ORM;
use App\Entity\Indicador;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
/**
* @ORM\Table(
@ -34,7 +34,7 @@
private $indicador;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="indicadorUsuario",cascade={"persist"})
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="indicadorUsuario",cascade={"persist"})
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id")
*/
private $greenEntrepreneur;
@ -60,12 +60,12 @@
return $this;
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

6
httpdocs/src/Entity/BussinessStage.php

@ -41,7 +41,7 @@ class BussinessStage extends AbstractPersonalTranslatable implements Translatabl
/**
* @ORM\OneToMany(targetEntity="App\Entity\GreenEntrepreneur", mappedBy="bussiness_stage")
* @ORM\OneToMany(targetEntity="App\Entity\Licitador", mappedBy="bussiness_stage")
*/
private $greenEntrepreneurs;
@ -91,7 +91,7 @@ class BussinessStage extends AbstractPersonalTranslatable implements Translatabl
return $this->greenEntrepreneurs;
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneurs->contains($greenEntrepreneur)) {
$this->greenEntrepreneurs->add($greenEntrepreneur);
@ -100,7 +100,7 @@ class BussinessStage extends AbstractPersonalTranslatable implements Translatabl
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneurs->contains($greenEntrepreneur)) {
$this->greenEntrepreneurs->removeElement($greenEntrepreneur);

6
httpdocs/src/Entity/Comentarios.php

@ -27,7 +27,7 @@ class Comentarios
private $fecha;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Trainer", inversedBy="comentarios")
* @ORM\ManyToOne(targetEntity="App\Entity\Supervisor", inversedBy="comentarios")
* @ORM\JoinColumn(name="trainer_id", referencedColumnName="id", onDelete="NO ACTION")
*/
private $trainer;
@ -77,12 +77,12 @@ class Comentarios
return $this;
}
public function getTrainer(): ?Trainer
public function getTrainer(): ?Supervisor
{
return $this->trainer;
}
public function setTrainer(?Trainer $trainer): self
public function setTrainer(?Supervisor $trainer): self
{
$this->trainer = $trainer;

12
httpdocs/src/Entity/FinancialActor.php → httpdocs/src/Entity/Contable.php

@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Entity(repositoryClass="App\Repository\FinancialActorRepository")
*/
class FinancialActor extends \App\Entity\User
class Contable extends \App\Entity\User
{
/**
* @ORM\Column(type="string", nullable=false)
@ -109,7 +109,7 @@ class FinancialActor extends \App\Entity\User
private $investment_criteria;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="financials")
* @ORM\ManyToMany(targetEntity="App\Entity\Licitador", inversedBy="financials")
* @ORM\JoinTable(
* name="greenentrepreneursharedfiles",
* joinColumns={@ORM\JoinColumn(name="financial_actor_id", referencedColumnName="id", nullable=false)},
@ -128,7 +128,7 @@ class FinancialActor extends \App\Entity\User
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getScopeOperations(): Collection
{
@ -156,7 +156,7 @@ class FinancialActor extends \App\Entity\User
return $this;
}
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getGreenEntrepreneur(): Collection
{
@ -164,7 +164,7 @@ class FinancialActor extends \App\Entity\User
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur[] = $greenEntrepreneur;
@ -174,7 +174,7 @@ class FinancialActor extends \App\Entity\User
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur->removeElement($greenEntrepreneur);

8
httpdocs/src/Entity/Convocatoria.php

@ -88,7 +88,7 @@ class Convocatoria
private $bso;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="convocatoria")
* @ORM\ManyToMany(targetEntity="App\Entity\Licitador", inversedBy="convocatoria")
* @ORM\JoinTable(
* name="GreenEnterPreneurConvocatoria",
* joinColumns={@ORM\JoinColumn(name="convocatoria_id", referencedColumnName="id", nullable=false)},
@ -151,14 +151,14 @@ class Convocatoria
}
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getGreenEntrepreneur(): Collection
{
return $this->greenEntrepreneur;
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur[] = $greenEntrepreneur;
@ -167,7 +167,7 @@ class Convocatoria
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur->removeElement($greenEntrepreneur);

6
httpdocs/src/Entity/Encuesta.php

@ -35,7 +35,7 @@ class Encuesta
/**
* @ORM\Id
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="formularioUsuario", cascade={"persist"})
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="formularioUsuario", cascade={"persist"})
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id", onDelete="NO ACTION")
*/
private $greenEntrepreneur;
@ -65,12 +65,12 @@ class Encuesta
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

8
httpdocs/src/Entity/Goal.php

@ -3,7 +3,7 @@
namespace App\Entity;
use Doctrine\ORM\Mapping as ORM;
use App\Entity\Indicador;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
/**
* @ORM\Table(
@ -34,7 +34,7 @@
private $indicador;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="goalUsuario",cascade={"persist"})
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="goalUsuario",cascade={"persist"})
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id")
*/
private $greenEntrepreneur;
@ -89,12 +89,12 @@
return $this;
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

6
httpdocs/src/Entity/Inscripcion.php

@ -38,7 +38,7 @@ class Inscripcion
private $campo_3;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="inscripciones")
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="inscripciones")
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id", nullable=false)
*/
private $greenEntrepreneur;
@ -107,12 +107,12 @@ class Inscripcion
return $this;
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

18
httpdocs/src/Entity/GreenEntrepreneur.php → httpdocs/src/Entity/Licitador.php

@ -17,7 +17,7 @@ use App\Entity\Goal;
/**
* @ORM\Entity(repositoryClass="App\Repository\GreenEntrepreneurRepository")
*/
class GreenEntrepreneur extends User
class Licitador extends User
{
/**
* @ORM\ManyToOne(targetEntity="App\Entity\BussinessStage", inversedBy="greenEntrepreneurs")
@ -80,12 +80,12 @@ class GreenEntrepreneur extends User
private $convocatoria;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\Trainer", mappedBy="greenEntrepreneur")
* @ORM\ManyToMany(targetEntity="App\Entity\Supervisor", mappedBy="greenEntrepreneur")
*/
private $trainer;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\FinancialActor", mappedBy="greenEntrepreneur")
* @ORM\ManyToMany(targetEntity="App\Entity\Contable", mappedBy="greenEntrepreneur")
*/
private $financials;
@ -458,14 +458,14 @@ class GreenEntrepreneur extends User
}
/**
* @return Collection|Trainer[]
* @return Collection|Supervisor[]
*/
public function getTrainer(): Collection
{
return $this->trainer;
}
public function addTrainer(Trainer $trainer): self
public function addTrainer(Supervisor $trainer): self
{
if (!$this->trainer->contains($trainer)) {
$this->trainer[] = $trainer;
@ -475,7 +475,7 @@ class GreenEntrepreneur extends User
return $this;
}
public function removeTrainer(Trainer $trainer): self
public function removeTrainer(Supervisor $trainer): self
{
if ($this->trainer->contains($trainer)) {
$this->trainer->removeElement($trainer);
@ -486,14 +486,14 @@ class GreenEntrepreneur extends User
}
/**
* @return Collection|Trainer[]
* @return Collection|Supervisor[]
*/
public function getFinancials(): Collection
{
return $this->financials;
}
public function addFinancial(FinancialActor $financialActor): self
public function addFinancial(Contable $financialActor): self
{
if (!$this->financials->contains($financialActor)) {
$this->financials[] = $financialActor;
@ -503,7 +503,7 @@ class GreenEntrepreneur extends User
return $this;
}
public function removeFinancial(FinancialActor $financialActor): self
public function removeFinancial(Contable $financialActor): self
{
if ($this->financials->contains($financialActor)) {
$this->financials->removeElement($financialActor);

2
httpdocs/src/Entity/Preguntas.php

@ -58,7 +58,7 @@ class Preguntas extends AbstractPersonalTranslatable implements TranslatableInte
*/
private $isEmail=0;
/**
* Is marked to Trainer review
* Is marked to Supervisor review
* @ORM\Column( type="boolean", nullable=true)
*/
private $isRevisable=0;

2
httpdocs/src/Entity/PreguntasFormulario.php

@ -62,7 +62,7 @@ class PreguntasFormulario //extends Preguntas
*/
private $isEmail=0;
/**
* Is marked to Trainer review
* Is marked to Supervisor review
* @ORM\Column( type="boolean", nullable=true)
*/
private $isRevisable=0;

6
httpdocs/src/Entity/ProcesoGreenEnterpreneur.php

@ -37,7 +37,7 @@
private $proceso;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="procesoUsuario",cascade={"persist"})
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="procesoUsuario",cascade={"persist"})
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id",onDelete="NO ACTION")
*/
private $greenEntrepreneur;
@ -84,12 +84,12 @@
return $this;
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

6
httpdocs/src/Entity/Respuestas.php

@ -44,7 +44,7 @@ class Respuestas
/**
* @ORM\Id
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="respuestas")
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="respuestas")
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id", nullable=false, onDelete="NO ACTION")
*/
private $greenEntrepreneur;
@ -179,12 +179,12 @@ class Respuestas
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

6
httpdocs/src/Entity/RespuestasFormulario.php

@ -34,7 +34,7 @@ class RespuestasFormulario
private $convocatoria;
/**
* @ORM\Id
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="respuestasformulario")
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="respuestasformulario")
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id", nullable=false, onDelete="NO ACTION")
*/
private $greenEntrepreneur;
@ -81,12 +81,12 @@ class RespuestasFormulario
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

14
httpdocs/src/Entity/Sector.php

@ -36,11 +36,11 @@
*/
private $indicadores;
/**
* @ORM\OneToMany(targetEntity="App\Entity\GreenEntrepreneur", mappedBy="sector")
* @ORM\OneToMany(targetEntity="App\Entity\Licitador", mappedBy="sector")
*/
private $greenEntrepreneurs;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\FinancialActor", mappedBy="scope_operations")
* @ORM\ManyToMany(targetEntity="App\Entity\Contable", mappedBy="scope_operations")
*/
private $financialactor;
@ -70,7 +70,7 @@
return $this->id;
}
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getFinancialactor(): Collection
{
@ -78,7 +78,7 @@
}
public function addFinancialactor(FinancialActor $fa): self
public function addFinancialactor(Contable $fa): self
{
if (!$this->financialactor->contains($fa)) {
$this->financialactor[] = $fa;
@ -88,7 +88,7 @@
return $this;
}
public function removeFinancialactor(FinancialActor $fa): self
public function removeFinancialactor(Contable $fa): self
{
if ($this->financialactor->contains($fa)) {
$this->financialactor->removeElement($fa);
@ -143,7 +143,7 @@
return $this->greenEntrepreneurs;
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneurs->contains($greenEntrepreneur)) {
$this->greenEntrepreneurs->add($greenEntrepreneur);
@ -152,7 +152,7 @@
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneurs->contains($greenEntrepreneur)) {
$this->greenEntrepreneurs->removeElement($greenEntrepreneur);

12
httpdocs/src/Entity/Bso.php → httpdocs/src/Entity/Servicio.php

@ -10,12 +10,12 @@ use Doctrine\ORM\Mapping as ORM;
/**
* @ORM\Entity
*/
class Bso extends \App\Entity\User
class Servicio extends \App\Entity\User
{
/**
* @ORM\Column(type="string", nullable=false)
* @Assert\NotBlank(message="Nombre de la compañia no puede estar en blanco")
* @Assert\NotBlank(message="Nombre del servicio no puede estar en blanco")
* @Assert\Length(
* min = 2,
* max = 255,
@ -60,7 +60,7 @@ class Bso extends \App\Entity\User
private $news;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\Trainer", mappedBy="bso")
* @ORM\ManyToMany(targetEntity="App\Entity\Supervisor", mappedBy="bso")
*/
private $trainer;
@ -137,14 +137,14 @@ class Bso extends \App\Entity\User
}
/**
* @return Collection|Trainer[]
* @return Collection|Supervisor[]
*/
public function getTrainer(): Collection
{
return $this->trainer;
}
public function addTrainer(Trainer $trainer): self
public function addTrainer(Supervisor $trainer): self
{
if (!$this->trainer->contains($trainer)) {
$this->trainer[] = $trainer;
@ -155,7 +155,7 @@ class Bso extends \App\Entity\User
return $this;
}
public function removeTrainer(Trainer $trainer): self
public function removeTrainer(Supervisor $trainer): self
{
if ($this->trainer->contains($trainer)) {
$this->trainer->removeElement($trainer);

10
httpdocs/src/Entity/Trainer.php → httpdocs/src/Entity/Supervisor.php

@ -9,7 +9,7 @@ use FOS\UserBundle\Model\GroupInterface as Group;
/**
* @ORM\Entity(repositoryClass="App\Repository\TrainerRepository")
*/
class Trainer extends \App\Entity\User
class Supervisor extends \App\Entity\User
{
/**
* @ORM\Column(type="array", nullable=false)
@ -50,7 +50,7 @@ class Trainer extends \App\Entity\User
$this->activities = $activities;
}
/**
* @ORM\ManyToMany(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="trainer")
* @ORM\ManyToMany(targetEntity="App\Entity\Licitador", inversedBy="trainer")
* @ORM\JoinTable(
* name="GreenEntrepreneurHasTrainer",
* joinColumns={@ORM\JoinColumn(name="trainer_id", referencedColumnName="id", nullable=false)},
@ -114,7 +114,7 @@ class Trainer extends \App\Entity\User
}
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getGreenEntrepreneur(): Collection
{
@ -190,7 +190,7 @@ class Trainer extends \App\Entity\User
return $this;
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur[] = $greenEntrepreneur;
@ -199,7 +199,7 @@ class Trainer extends \App\Entity\User
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur->removeElement($greenEntrepreneur);

6
httpdocs/src/Entity/TareaGreenEnterpreneur.php

@ -31,7 +31,7 @@ class TareaGreenEnterpreneur
/**
* @ORM\Id
* @ORM\ManyToOne(targetEntity="App\Entity\GreenEntrepreneur", inversedBy="tareaUsuario", cascade={"persist"})
* @ORM\ManyToOne(targetEntity="App\Entity\Licitador", inversedBy="tareaUsuario", cascade={"persist"})
* @ORM\JoinColumn(name="green_entrepreneur_id", referencedColumnName="id", onDelete="NO ACTION")
*/
private $greenEntrepreneur;
@ -71,12 +71,12 @@ class TareaGreenEnterpreneur
return $this;
}
public function getGreenEntrepreneur(): ?GreenEntrepreneur
public function getGreenEntrepreneur(): ?Licitador
{
return $this->greenEntrepreneur;
}
public function setGreenEntrepreneur(?GreenEntrepreneur $greenEntrepreneur): self
public function setGreenEntrepreneur(?Licitador $greenEntrepreneur): self
{
$this->greenEntrepreneur = $greenEntrepreneur;

6
httpdocs/src/Entity/User.php

@ -27,10 +27,10 @@ use Vich\UploaderBundle\Mapping\Annotation as Vich;
* @ORM\DiscriminatorColumn(name="type", type="string")
* @ORM\DiscriminatorMap({
* "backend_user":"App\Entity\User",
* "green_entrepreneur":"App\Entity\GreenEntrepreneur",
* "green_entrepreneur":"App\Entity\Licitador",
* "bso":"App\Entity\Bso",
* "trainer":"App\Entity\Trainer",
* "financial_actor":"App\Entity\FinancialActor"
* "trainer":"App\Entity\Supervisor",
* "financial_actor":"App\Entity\Contable"
* })
* @Vich\Uploadable
*/

16
httpdocs/src/Entity/WorkShop.php

@ -59,7 +59,7 @@ class WorkShop
private $sala;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\Trainer", inversedBy="workShop")
* @ORM\ManyToMany(targetEntity="App\Entity\Supervisor", inversedBy="workShop")
* @ORM\JoinColumn(name="trainer_id", referencedColumnName="id")
* @Assert\NotBlank()
* @Assert\Valid()
@ -79,7 +79,7 @@ class WorkShop
private $procesos;
/**
* @ORM\ManyToMany(targetEntity="App\Entity\GreenEntrepreneur", mappedBy="workShop", cascade={"persist"})
* @ORM\ManyToMany(targetEntity="App\Entity\Licitador", mappedBy="workShop", cascade={"persist"})
*/
private $greenEntrepreneur;
@ -184,14 +184,14 @@ class WorkShop
return $this;
}
/**
* @return Collection|Trainer[]
* @return Collection|Supervisor[]
*/
public function getTrainer(): Collection
{
return $this->trainer;
}
public function addTrainer(Trainer $trainer): self
public function addTrainer(Supervisor $trainer): self
{
if (!$this->trainer->contains($trainer)) {
$this->trainer->add($trainer);
@ -201,7 +201,7 @@ class WorkShop
return $this;
}
public function removeTrainer(Trainer $trainer): self
public function removeTrainer(Supervisor $trainer): self
{
if ($this->trainer->contains($trainer)) {
$this->trainer->removeElement($trainer);
@ -242,14 +242,14 @@ class WorkShop
}
/**
* @return Collection|GreenEntrepreneur[]
* @return Collection|Licitador[]
*/
public function getGreenEntrepreneur(): Collection
{
return $this->greenEntrepreneur;
}
public function addGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function addGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if (!$this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur->add($greenEntrepreneur);
@ -259,7 +259,7 @@ class WorkShop
return $this;
}
public function removeGreenEntrepreneur(GreenEntrepreneur $greenEntrepreneur): self
public function removeGreenEntrepreneur(Licitador $greenEntrepreneur): self
{
if ($this->greenEntrepreneur->contains($greenEntrepreneur)) {
$this->greenEntrepreneur->removeElement($greenEntrepreneur);

6
httpdocs/src/Form/Type/RegistrationFinancialActorFormType.php

@ -3,7 +3,7 @@
namespace App\Form\Type;
use AdamQuaile\Bundle\FieldsetBundle\Form\FieldsetType;
use App\Entity\FinancialActor;
use App\Entity\Contable;
use App\Entity\Sector;
use Sonata\Form\Type\DatePickerType;
use Sonata\UserBundle\Model\UserInterface;
@ -36,7 +36,7 @@ class RegistrationFinancialActorFormType extends RegistrationFormType
/**
* @param string $class The User class name
*/
public function __construct(string $class='FinancialActor')
public function __construct(string $class='Contable')
{
$this->class = $class;
}
@ -209,7 +209,7 @@ class RegistrationFinancialActorFormType extends RegistrationFormType
{
$resolver->setDefaults(
[
'data_class' => 'App\Entity\FinancialActor'
'data_class' => 'App\Entity\Contable'
]
);
}

4
httpdocs/src/Form/Type/RegistrationGreenEnterpreneurFormType.php

@ -35,7 +35,7 @@ class RegistrationGreenEnterpreneurFormType extends AbstractType
/**
* @param string $class The User class name
*/
public function __construct(string $class='GreenEntrepreneur')
public function __construct(string $class='Licitador')
{
$this->class = $class;
}
@ -190,7 +190,7 @@ class RegistrationGreenEnterpreneurFormType extends AbstractType
{
$resolver->setDefaults(
[
'data_class' => 'App\Entity\GreenEntrepreneur'
'data_class' => 'App\Entity\Licitador'
]
);
}

4
httpdocs/src/Form/Type/RegistrationTrainerFormType.php

@ -34,7 +34,7 @@ class RegistrationTrainerFormType extends AbstractType
/**
* @param string $class The User class name
*/
public function __construct(string $class= 'Trainer')
public function __construct(string $class= 'Supervisor')
{
$this->class = $class;
}
@ -166,7 +166,7 @@ class RegistrationTrainerFormType extends AbstractType
{
$resolver->setDefaults(
[
'data_class' => 'App\Entity\Trainer'
'data_class' => 'App\Entity\Supervisor'
]
);
}

2
httpdocs/src/Repository/FinancialActorRepository.php

@ -2,7 +2,7 @@
namespace App\Repository;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry;
use Doctrine\ORM\EntityRepository;

4
httpdocs/src/Repository/GreenEntrepreneurRepository.php

@ -2,7 +2,7 @@
namespace App\Repository;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry;
@ -10,7 +10,7 @@ class GreenEntrepreneurRepository extends ServiceEntityRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, GreenEntrepreneur::class);
parent::__construct($registry, Licitador::class);
}
public function findCasoEstudio($language){
return $this->createQueryBuilder('ge')->where('username = :username')

2
httpdocs/src/Resources/SonataAdminBundle/views/CRUD/list__action_share_files.html.twig

@ -9,7 +9,7 @@ file that was distributed with this source code.
#}
{% if instanceof(object, "\\App\\Entity\\FinancialActor") %}
{% if instanceof(object, "\\App\\Entity\\Contable") %}
<a
href="{{ path('admin_app_greenentrepreneur_giveAccessToFiles',{ 'id': object.id }) }}"
class="btn btn-sm btn-default" data-toggle="modal"

2
httpdocs/src/Resources/SonataAdminBundle/views/CRUD/list__action_view_files.html.twig

@ -9,7 +9,7 @@ file that was distributed with this source code.
#}
{% if instanceof(object, "\\App\\Entity\\GreenEntrepreneur") %}
{% if instanceof(object, "\\App\\Entity\\Licitador") %}
<a
href="{{ path('admin_app_greenentrepreneur_viewFiles',{ 'id': object.id }) }}"
class="btn btn-sm btn-default delete_link" data-toggle="modal"

6
httpdocs/src/Resources/views/formcomponents/datatable.html.twig

@ -40,11 +40,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}" name="review-{{ pregunta.alias }}" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}" name="comment-{{ pregunta.alias }}" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}
@ -133,7 +133,7 @@
{% set encontrada=true %}
<textarea class="form-control" id="{{pregunta.alias }}" name="{{pregunta.alias }}" placeholder="{{ pregunta.placeholder|trans({}) }}" {{ pregunta.TipoPreguntaOptions|raw }} rows="10" {% if pregunta.isRequired %} parsley-minlength="3" parsley-required="true" required {% endif %}{% if not pregunta.editable and 'caso_estudio' not in app.user.username and 'caso_estudio' not in app.user.name %} readonly {% endif %}>{{ respuesta[pregunta.alias] }}</textarea>
{% if pregunta.isRevisable and reviewed[pregunta.alias] and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty%}
<div><label>{{ 'Trainer Comment'|trans({}) }}</label>
<div><label>{{ 'Supervisor Comment'|trans({}) }}</label>
<pre>{{ comentarios[pregunta.alias].comentario|raw }}</pre>
</div>
{% endif %}

4
httpdocs/src/Resources/views/formcomponents/repetible/range.html.twig

@ -36,11 +36,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}-{{ index }}" name="review-{{ pregunta.alias }}[]" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}-{{ index }}" name="comment-{{ pregunta.alias }}[]" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}

4
httpdocs/src/Resources/views/formcomponents/repetible/text.html.twig

@ -42,11 +42,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}-{{ index }}" name="review-{{ pregunta.alias }}[]" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}-{{ index }}" name="comment-{{ pregunta.alias }}[]" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}

6
httpdocs/src/Resources/views/formcomponents/text.html.twig

@ -40,11 +40,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}" name="review-{{ pregunta.alias }}" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}" name="comment-{{ pregunta.alias }}" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}
@ -58,7 +58,7 @@
{% set encontrada=true %}
<textarea class="form-control" id="{{pregunta.alias }}" name="{{pregunta.alias }}" placeholder="{{ pregunta.placeholder|trans({}) }}" {{ pregunta.TipoPreguntaOptions|raw }} rows="10" {% if pregunta.isRequired %} parsley-minlength="3" parsley-required="true" required {% endif %}{% if not pregunta.editable and 'caso_estudio' not in app.user.username and 'caso_estudio' not in app.user.name %} readonly {% endif %}>{{ respuesta[pregunta.alias] }}</textarea>
{% if pregunta.isRevisable and reviewed[pregunta.alias] and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty%}
<div><label>{{ 'Trainer Comment'|trans({}) }}</label>
<div><label>{{ 'Supervisor Comment'|trans({}) }}</label>
<pre>{{ comentarios[pregunta.alias].comentario|raw }}</pre>
</div>
{% endif %}

2
httpdocs/src/RuleEngine/Conditions/PerfilesCondition.php

@ -35,7 +35,7 @@ class PerfilesCondition extends AbstractArrayCondition
['key' => '5', 'label' => 'Financial Actor'],
['key' => '2', 'label' => 'BSO'],
['key' => '1', 'label' => 'GreenEntrepeneur'],
['key' => '0', 'label' => 'Trainer'],
['key' => '0', 'label' => 'Supervisor'],
];
// Details about the operator definition structure can be found in the Operator definition section.

2
httpdocs/src/RuleEngine/Conditions/RespuestasCondition.php

@ -2,7 +2,7 @@
namespace App\RuleEngine\Conditions;
use App\Entity\GreenEntrepreneur;
use App\Entity\Licitador;
use Zitec\RuleEngineBundle\Conditions\AbstractValueCondition;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\UsageTrackingTokenStorage;

6
httpdocs/templates/database/components/formcomponents/datatable.html.twig

@ -40,11 +40,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}" name="review-{{ pregunta.alias }}" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}" name="comment-{{ pregunta.alias }}" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}
@ -69,7 +69,7 @@
<input id="{{ pregunta.alias }}" name="{{ pregunta.alias }}" type="hidden" value="{{respuesta[pregunta.alias]}}">
<table class="dataTable" id="{{ pregunta.alias }}_table"></table>
{% if pregunta.isRevisable and reviewed[pregunta.alias] and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty%}
<div><label>{{ 'Trainer Comment'|trans({}) }}</label>
<div><label>{{ 'Supervisor Comment'|trans({}) }}</label>
<pre>{{ comentarios[pregunta.alias].comentario|raw }}</pre>
</div>
{% endif %}

6
httpdocs/templates/database/components/formcomponents/text.html.twig

@ -40,11 +40,11 @@
</div>
{% if pregunta.isRevisable %}
<div>
<label for="review-{{ pregunta.alias }}">{{ 'Trainer Review Mark'|trans({}) }}</label>
<label for="review-{{ pregunta.alias }}">{{ 'Supervisor Review Mark'|trans({}) }}</label>
<input type="checkbox" class="form-control icheckbox_minimal" data-sonata-icheck="false" id="review-{{ pregunta.alias }}" name="review-{{ pregunta.alias }}" {% if reviewed[pregunta.alias] is defined and reviewed[pregunta.alias] == true %} checked {% endif%} %}></input>
</div>
<div>
<label for="comment-{{ pregunta.alias }}">{{ 'Trainer Comment'|trans({}) }}</label>
<label for="comment-{{ pregunta.alias }}">{{ 'Supervisor Comment'|trans({}) }}</label>
<textarea class="form-control" id="comment-{{ pregunta.alias }}" name="comment-{{ pregunta.alias }}" rows="10"> {% if comentarios is defined and comentarios[pregunta.alias] is defined and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty %}{{ comentarios[pregunta.alias].comentario|raw}}{% endif %}</textarea>
</div>
{% endif %}
@ -58,7 +58,7 @@
{% set encontrada=true %}
<textarea class="form-control" id="{{pregunta.alias }}" name="{{pregunta.alias }}" placeholder="{{ pregunta.placeholder|trans({}) }}" {{ pregunta.TipoPreguntaOptions|raw }} rows="10" {% if pregunta.isRequired %} parsley-minlength="3" parsley-required="true" required {% endif %}{% if not pregunta.editable and 'caso_estudio' not in app.user.username and 'caso_estudio' not in app.user.name %} readonly {% endif %}>{{ respuesta[pregunta.alias] }}</textarea>
{% if pregunta.isRevisable and reviewed[pregunta.alias] and comentarios[pregunta.alias].comentario is defined and comentarios[pregunta.alias].comentario is not empty%}
<div><label>{{ 'Trainer Comment'|trans({}) }}</label>
<div><label>{{ 'Supervisor Comment'|trans({}) }}</label>
<pre>{{ comentarios[pregunta.alias].comentario|raw }}</pre>
</div>
{% endif %}

Loading…
Cancel
Save