mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
remove email sent to alert on serientermin since we do this in cronjob now;
This commit is contained in:
@@ -744,48 +744,11 @@ class Abgabe extends FHCAPI_Controller
|
||||
$dataAbgabe = $this->getDataOrTerminateWithError($result);
|
||||
|
||||
$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
|
||||
|
||||
// $res[] = $data;
|
||||
|
||||
// send mail to student
|
||||
$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
|
||||
$data = $this->getDataOrTerminateWithError($result);
|
||||
|
||||
// $this->addMeta('emaildata'.$projektarbeit_id, $data);
|
||||
|
||||
$datetime = new DateTime($datum);
|
||||
$dateEmailFormatted = $datetime->format('d.m.Y');
|
||||
|
||||
$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
|
||||
|
||||
$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
|
||||
$res[] = $fullFormattedNameString;
|
||||
|
||||
// Prepare mail content
|
||||
$body_fields = array(
|
||||
'anrede' => $data[0]->anrede,
|
||||
'anredeFillString' => $anredeFillString,
|
||||
'datum' => $dateEmailFormatted,
|
||||
'bezeichnung' => $bezeichnung,
|
||||
'fullFormattedNameString' => $fullFormattedNameString,
|
||||
'kurzbz' => $kurzbz
|
||||
);
|
||||
|
||||
$email = $data[0]->uid."@".DOMAIN;
|
||||
|
||||
// TODO: nightly email job informing about new serientermine
|
||||
|
||||
// sendSanchoMail(
|
||||
// 'neuerAbgabetermin',
|
||||
// $body_fields,
|
||||
// $email,
|
||||
// $this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
|
||||
// );
|
||||
}
|
||||
|
||||
$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
|
||||
|
||||
$this->terminateWithSuccess(array($res, $abgaben));
|
||||
$this->terminateWithSuccess($abgaben);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -412,19 +412,15 @@ export const AbgabetoolAssistenz = {
|
||||
pids,
|
||||
this.serienTermin.fixtermin
|
||||
)).then(res => {
|
||||
// TODO
|
||||
// sticky lifetime somehow
|
||||
|
||||
if (res.meta.status === "success" && res.data) {
|
||||
this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
|
||||
// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
|
||||
this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data[0])]));
|
||||
} else {
|
||||
this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
|
||||
}
|
||||
|
||||
// put new abgaben into projektarbeiten
|
||||
const newAbgaben = res.data[1]
|
||||
const newAbgaben = res.data
|
||||
pids.forEach(pid => {
|
||||
const abgabe = newAbgaben.find(abgabe => abgabe.projektarbeit_id == pid)
|
||||
|
||||
@@ -444,8 +440,7 @@ export const AbgabetoolAssistenz = {
|
||||
|
||||
this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
|
||||
this.$refs.abgabeTable.tabulator.replaceData(mappedData)
|
||||
|
||||
// this.$refs.abgabeTable.tabulator.redraw(true)
|
||||
this.$refs.abgabeTable.tabulator.redraw(true)
|
||||
}).finally(()=>{
|
||||
this.saving = false
|
||||
})
|
||||
|
||||
@@ -184,8 +184,6 @@ export const AbgabetoolMitarbeiter = {
|
||||
)).then(res => {
|
||||
if (res.meta.status === "success" && res.data) {
|
||||
this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
|
||||
// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
|
||||
this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
|
||||
} else {
|
||||
this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
|
||||
}
|
||||
|
||||
@@ -43343,7 +43343,7 @@ array(
|
||||
),
|
||||
array(
|
||||
'sprache' => 'English',
|
||||
'text' => 'Edit additional Data',
|
||||
'text' => 'Edit additional data',
|
||||
'description' => '',
|
||||
'insertvon' => 'system'
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user