Commit 1e6e19f6 authored by Open Source Developer's avatar Open Source Developer

pull

parent 18aec6b5
This diff is collapsed.
......@@ -16,7 +16,7 @@ class Crypt
if (is_string($fname)) {
$this->fname = $fname;
} else {
$this->fname = __DIR__ . "/../../../../../../app.txt";
$this->fname = __DIR__ . "/../../../../../app.txt";
}
}
......
......@@ -1034,6 +1034,26 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
->setDisplayConfigurable('form', true)
->setDisplayConfigurable('view', true);
$fields['second_period'] = BaseFieldDefinition::create('boolean')
->setLabel(t('Δεύτερη περίοδος αιτήσεων'))
->setDescription(t('Δεύτερη περίοδος αιτήσεων.'))
->setSettings(array(
'text_processing' => 0,
))
->setRequired(false)
->setDefaultValue(false)
->setDisplayOptions('view', array(
'label' => 'above',
'type' => 'boolean',
'weight' => -4,
))
->setDisplayOptions('form', array(
'type' => 'boolean',
'weight' => -4,
))
->setDisplayConfigurable('form', true)
->setDisplayConfigurable('view', true);
$fields['guardian_name'] = BaseFieldDefinition::create('string')
->setLabel(t('Όνομα κηδεμόνα'))
->setDescription(t('Δώσε το όνομα κηδεμόνα.'))
......@@ -1218,6 +1238,8 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
->setDisplayConfigurable('form', true)
->setDisplayConfigurable('view', true);
$fields['status'] = BaseFieldDefinition::create('boolean')
->setLabel(t('Publishing status'))
->setDescription(t('A boolean indicating whether the EPAL Student is published.'))
......@@ -1233,4 +1255,4 @@ class EpalStudent extends ContentEntityBase implements EpalStudentInterface
return $fields;
}
}
}
\ No newline at end of file
......@@ -67,13 +67,13 @@ import {
</div>
<div id="checksaved" (onHidden)="onHidden('#checksaved')"
<div id="checksaved1" (onHidden)="onHidden('#checksaved1')"
class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header modal-header-danger">
<h3 class="modal-title pull-left"><i class="fa fa-check-square-o"></i>&nbsp;&nbsp;Πρέπει να συπληρώσετε σωστά τη δυναμική</h3>
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#checksaved')">
<button type="button" class="close pull-right" aria-label="Close" (click)="hideModal('#checksaved1')">
<span aria-hidden="true"><i class="fa fa-times"></i></span>
</button>
</div>
......@@ -127,7 +127,7 @@ import {
public showModal(popupMsgId):void {
console.log("about to show modal");
console.log("about to show modal",popupMsgId);
//(<any>$('#distributionWaitingNotice')).modal('show');
(<any>$(popupMsgId)).modal('show');
}
......@@ -147,7 +147,7 @@ import {
}
ngOnInit() {
(<any>$('#checksaved')).appendTo("body");
(<any>$('#checksaved1')).appendTo("body");
this.SchoolSub = this._hds.gettypeofschool().subscribe(x => {
this.School$.next(x);
console.log(x[0].type, "schoolid!");
......@@ -195,7 +195,7 @@ import {
{
if (this.newvalue <=0 || this.newvalue >10)
{
this.showModal("#checksaved");
this.showModal("#checksaved1");
}
else
{
......@@ -226,7 +226,7 @@ import {
else
{
if (oldvalue === null)
this.showModal("#checksaved");
this.showModal("#checksaved1");
}
}
......
......@@ -272,8 +272,8 @@ import {
public showModal(popupMsgId):void {
console.log("about to show modal");
console.log("about to show modal", popupMsgId);
(<any>$(popupMsgId)).modal('show');
}
......
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