resolved conflicts

parents c2eab043 3ce06d4d
...@@ -26,7 +26,7 @@ function eepal_help($route_name, RouteMatchInterface $route_match) { ...@@ -26,7 +26,7 @@ function eepal_help($route_name, RouteMatchInterface $route_match) {
} }
function eepal_form_user_register_form_alter(&$form, FormStateInterface $form_state) { /* function eepal_form_user_register_form_alter(&$form, FormStateInterface $form_state) {
// Code to alter form or form state here / add a field // Code to alter form or form state here / add a field
$form['amka'] = array( $form['amka'] = array(
'#required' => TRUE, '#required' => TRUE,
...@@ -56,4 +56,4 @@ function eepal_form_user_login_form_alter(&$form, FormStateInterface $form_state ...@@ -56,4 +56,4 @@ function eepal_form_user_login_form_alter(&$form, FormStateInterface $form_state
function eepal_user_login_form_submit_handler(array&$form, FormStateInterface $form_state) { function eepal_user_login_form_submit_handler(array&$form, FormStateInterface $form_state) {
$form_state->setRedirect('eepal_processall'); $form_state->setRedirect('eepal_processall');
} } */
...@@ -43,7 +43,7 @@ public function __construct(EntityTypeManagerInterface $entityTypeManager, Query ...@@ -43,7 +43,7 @@ public function __construct(EntityTypeManagerInterface $entityTypeManager, Query
array_push($arrayToReturn, array_push($arrayToReturn,
array( array(
array('data' => $studentClass->get('name')->value, 'class' => 'not-editable'), array('data' => $studentClass->get('name')->value, 'class' => 'not-editable'),
array('data' => markup("<input type='text'" . "value='" . $studentClass->get('maxno')->value . "'>"), 'class' => 'editable') array('data' => "hello")
)); ));
} }
......
...@@ -49,6 +49,9 @@ use Drupal\user\UserInterface; ...@@ -49,6 +49,9 @@ use Drupal\user\UserInterface;
* "uid" = "user_id", * "uid" = "user_id",
* "langcode" = "langcode", * "langcode" = "langcode",
* "status" = "status", * "status" = "status",
* "surname" = "surname",
* "address" = "address",
* "birthdate" = "birthdate",
* }, * },
* links = { * links = {
* "canonical" = "/admin/structure/student/{student}", * "canonical" = "/admin/structure/student/{student}",
...@@ -116,6 +119,53 @@ class Student extends RevisionableContentEntityBase implements StudentInterface ...@@ -116,6 +119,53 @@ class Student extends RevisionableContentEntityBase implements StudentInterface
return $this; return $this;
} }
/**
* {@inheritdoc}
*/
public function getSurname() {
return $this->get('surname')->value;
}
/**
* {@inheritdoc}
*/
public function setSurname($surname) {
$this->set('surname', $surname);
return $this;
}
/**
* {@inheritdoc}
*/
public function getAddress() {
return $this->get('address')->value;
}
/**
* {@inheritdoc}
*/
public function setAddress($address) {
$this->set('address', $address);
return $this;
}
/**
* {@inheritdoc}
*/
public function getBirthdate() {
return $this->get('birthdate')->value;
}
/**
* {@inheritdoc}
*/
public function setBirthdate($birthdate) {
$this->set('birthdate', $birthdate);
return $this;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment