diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index e663ba42a5..88a1d265d8 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -5454,7 +5454,7 @@ class SessionManager $joinSSfvTable = $sTable . ' o INNER JOIN ' . $sfvTable . ' q ON s.id = sfv.session_id'; $joinTable = $sfTable . ' sf INNER JOIN ' . $sfvTable . ' sfv ON sf.id = sfv.field_id'; $fieldsArray = array( - 'as_description', 'modalidad', 'duracion', 'vacantes', 'brochure', 'publico_objetivo', 'horario' + 'short_description', 'mode', 'duration', 'vacancies', 'brochure', 'target', 'schedule' ); $sessionList = Database::select( 'id, name, date_start, date_end', @@ -5464,7 +5464,7 @@ class SessionManager "session_category_id = ? AND id IN ( SELECT sfv.session_id FROM $joinTable WHERE sfv.session_id = session.id - AND sf.field_variable = 'publico_objetivo' + AND sf.field_variable = 'target' AND sfv.field_value = ? );" => array($categoryId, $publicoObjetivo) ) diff --git a/plugin/advancedsubscription/ajax/advsub.ajax.php b/plugin/advancedsubscription/ajax/advsub.ajax.php index 6dada518f3..1576f1890d 100644 --- a/plugin/advancedsubscription/ajax/advsub.ajax.php +++ b/plugin/advancedsubscription/ajax/advsub.ajax.php @@ -64,13 +64,13 @@ if (!empty($a) && !empty($u)) { $sessionArray = api_get_session_info($s); $extraSession = new ExtraFieldValue('session'); $var = $extraSession->get_values_by_handler_and_field_variable($s, 'as_description'); - $sessionArray['description'] = $var['field_valiue']; - $var = $extraSession->get_values_by_handler_and_field_variable($s, 'publico_objetivo'); - $sessionArray['publico_objetivo'] = $var['field_valiue']; - $var = $extraSession->get_values_by_handler_and_field_variable($s, 'modalidad'); - $sessionArray['modalidad'] = $var['field_valiue']; + $sessionArray['as_description'] = $var['field_valiue']; + $var = $extraSession->get_values_by_handler_and_field_variable($s, 'target'); + $sessionArray['target'] = $var['field_valiue']; + $var = $extraSession->get_values_by_handler_and_field_variable($s, 'mode'); + $sessionArray['mode'] = $var['field_valiue']; $var = $extraSession->get_values_by_handler_and_field_variable($s, 'fin_publicacion'); - $sessionArray['publico_objetivo'] = $var['field_value']; + $sessionArray['fin_publicacion'] = $var['field_value']; $var = $extraSession->get_values_by_handler_and_field_variable($s, 'numero_recomendado_participantes'); $sessionArray['recommended_subscription_limit'] = $var['field_valiue']; $studentArray = api_get_user_info($u); diff --git a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php index 4701857fe9..a581fd90fc 100644 --- a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php +++ b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php @@ -134,13 +134,13 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface // @TODO: Get UIT completed by user this year by WS $uitUser = 0; $extra = new ExtraFieldValue('session'); - $var = $extra->get_values_by_handler_and_field_variable($params['session_id'], 'costo'); + $var = $extra->get_values_by_handler_and_field_variable($params['session_id'], 'cost'); $uitUser += $var['field_value']; if ($uitMax >= $uitUser) { $expendedTimeMax = $advSubPlugin->get('yearly_hours_limit'); // @TODO: Get Expended time from user data $expendedTime = 0; - $var = $extra->get_values_by_handler_and_field_variable($params['session_id'], 'duracion'); + $var = $extra->get_values_by_handler_and_field_variable($params['session_id'], 'duration'); $expendedTime += $var['field_value']; if ($expendedTimeMax >= $expendedTime) { $expendedNumMax = $advSubPlugin->get('courses_count_limit'); @@ -632,7 +632,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface { if (!empty($sessionId)) { $extra = new ExtraFieldValue('session'); - $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'vacantes'); + $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'vacancies'); $vacancy = intval($var['field_value']); if (!empty($vacancy)) { $vacancy -= $this->countQueueByParams(array('sessions' => $sessionId, 'status' => ADV_SUB_QUEUE_STATUS_ADMIN_APPROVED)); @@ -658,12 +658,12 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $extra = new ExtraFieldValue('session'); $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'id'); $data['id'] = $var['field_value']; - $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'costo'); + $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'cost'); $data['cost'] = $var['field_value']; - $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'lugar'); + $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'place'); $data['place'] = $var['field_value']; - $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'permitir_visitantes'); - $data['visitors'] = $var['field_value']; + $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'allow_visitors'); + $data['allow_visitors'] = $var['field_value']; $var = $extra->get_values_by_handler_and_field_variable($sessionId, 'horas_lectivas'); $data['duration'] = $var['field_value']; // Get brochure URL @@ -763,16 +763,16 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $return = array(); $extraSession = new ExtraFieldValue('session'); $session = api_get_session_info($sessionId); - $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'publico_objetivo'); - $session['publico_objetivo'] = $var['field_value']; + $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'target'); + $session['target'] = $var['field_value']; $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'fin_publicacion'); $session['fin_publicacion'] = $var['field_value']; - $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'modalidad'); - $session['modalidad'] = $var['field_value']; + $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'mode'); + $session['mode'] = $var['field_value']; $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'numero_recomendado_participantes'); $session['participantes_recomendados'] = $var['field_value']; - $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'vacantes'); - $session['vacantes'] = $var['field_value']; + $var = $extraSession->get_values_by_handler_and_field_variable($sessionId, 'vacancies'); + $session['vacancies'] = $var['field_value']; $queueTable = Database::get_main_table(TABLE_ADV_SUB_QUEUE); $userTable = Database::get_main_table(TABLE_MAIN_USER); $userJoinTable = $queueTable . ' q INNER JOIN ' . $userTable . ' u ON q.user_id = u.user_id'; diff --git a/plugin/advancedsubscription/src/HookAdvancedSubscription.class.php b/plugin/advancedsubscription/src/HookAdvancedSubscription.class.php index 0a3a997827..7783367dd7 100644 --- a/plugin/advancedsubscription/src/HookAdvancedSubscription.class.php +++ b/plugin/advancedsubscription/src/HookAdvancedSubscription.class.php @@ -69,15 +69,15 @@ class HookAdvancedSubscription extends HookObserver implements 'all', '', array( - 'id' => array('name' => 'id', 'type' => 'xsd:int'), // session.name + 'id' => array('name' => 'id', 'type' => 'xsd:int'), // session.id 'name' => array('name' => 'name', 'type' => 'xsd:string'), // session.name - 'as_description' => array('name' => 'as_description', 'type' => 'xsd:string'), // session.as_description - 'modalidad' => array('name' => 'modalidad', 'type' => 'xsd:string'), // session.modalidad + 'short_description' => array('name' => 'short_description', 'type' => 'xsd:string'), // session.short_description + 'mode' => array('name' => 'mode', 'type' => 'xsd:string'), // session.mode 'date_start' => array('name' => 'date_start', 'type' => 'xsd:string'), // session.date_start 'date_end' => array('name' => 'date_end', 'type' => 'xsd:string'), // session.date_end - 'duracion' => array('name' => 'duracion', 'type' => 'xsd:string'), // session.duracion - 'vacantes' => array('name' => 'vacantes', 'type' => 'xsd:string'), // session.vacantes - 'horario' => array('name' => 'horario', 'type' => 'xsd:string'), // session.horario + 'duration' => array('name' => 'duration', 'type' => 'xsd:string'), // session.duration + 'vacancies' => array('name' => 'vacancies', 'type' => 'xsd:string'), // session.vacancies + 'schedule' => array('name' => 'schedule', 'type' => 'xsd:string'), // session.schedule ) ); @@ -106,7 +106,7 @@ class HookAdvancedSubscription extends HookObserver implements array( 'id' => array('name' => 'id', 'type' => 'xsd:string'), // session_category.id 'name' => array('name' => 'name', 'type' => 'xsd:string'), // session_category.name - 'publico_objetivo' => array('name' => 'publico_objetivo', 'type' => 'xsd:string'), // session.publico_objetivo + 'target' => array('name' => 'target', 'type' => 'xsd:string'), // session.target 'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string') ) ); @@ -136,13 +136,13 @@ class HookAdvancedSubscription extends HookObserver implements '', array( 'id' => array('name' => 'id', 'type' => 'xsd:string'), // session.id - 'cost' => array('name' => 'cost', 'type' => 'xsd:float'), // session.costo - 'place' => array('name' => 'place', 'type' => 'xsd:string'), // session.lugar - 'visitors' => array('name' => 'visitors', 'type' => 'xsd:string'), // session.permitir_visitantes - 'duration' => array('name' => 'duration', 'type' => 'xsd:int'), // session.duracion + 'cost' => array('name' => 'cost', 'type' => 'xsd:float'), // session.cost + 'place' => array('name' => 'place', 'type' => 'xsd:string'), // session.place + 'allow_visitors' => array('name' => 'allow_visitors', 'type' => 'xsd:string'), // session.allow_visitors + 'duration' => array('name' => 'duration', 'type' => 'xsd:int'), // session.duration 'brochure' => array('name' => 'brochure', 'type' => 'xsd:string'), // session.brochure 'banner' => array('name' => 'banner', 'type' => 'xsd:string'), // session.banner - 'description_full' => array('name' => 'description_full', 'type' => 'xsd:string'), // session.description + 'as_description' => array('name' => 'as_description', 'type' => 'xsd:string'), // session.description 'status' => array('name' => 'status', 'type' => 'xsd:string'), // status 'action_url' => array('name' => 'action_url', 'type' => 'xsd:string'), // action_url 'message' => array('name' => 'error_message', 'type' => 'xsd:string'), // message @@ -407,7 +407,7 @@ class HookAdvancedSubscription extends HookObserver implements } // Get the session brief List by category - $sessionList = SessionManager::getSessionBriefListByCategory($sessionCategoryId, $params['publico_objetivo']); + $sessionList = SessionManager::getSessionBriefListByCategory($sessionCategoryId, $params['target']); return $sessionList; } diff --git a/plugin/advancedsubscription/views/admin_view.tpl b/plugin/advancedsubscription/views/admin_view.tpl index ac5fad3dd3..9bdc319cc0 100644 --- a/plugin/advancedsubscription/views/admin_view.tpl +++ b/plugin/advancedsubscription/views/admin_view.tpl @@ -7,22 +7,22 @@ {% endfor %}
- Nombre de la sessión: {{ session.name }} + {{ Name | get_lang }}: {{ session.name }}
- Publico objetivo: {{ session.publico_objetivo }} + {{ Target | get_lang }}: {{ session.target }}
- Fin de publicación: {{ session.fin_publicacion }} + {{ PublicationEndDate | get_lang }}: {{ session.fin_publicacion }}
- Modalidad: {{ session.modalidad }} + {{ Mode | get_lang }}: {{ session.mode }}
- Número de participantes recomendados : {{ session.participantes_recomendados }} + {{ RecommendedNumberOfParticipants | get_lang }} : {{ session.participantes_recomendados }}
- Vacantes: {{ session.vacantes }} + {{ Vacancies | get_lang }}: {{ session.vacancies }}