diff --git a/kaform.js b/kaform.js
index 22d902c..e6e9ecd 100644
--- a/kaform.js
+++ b/kaform.js
@@ -37,16 +37,12 @@ function checkAllRows(){
f=3;
v =row.cells[f].firstElementChild.value;
- if ( !v ){ // Datum
+ if ( !isFloat(v) ){ // Amount
row.cells[f].firstElementChild.focus();
showAlert("Bitte gib einen gültigen Betrag ein!");
return false;
}
-
-
-
-
}
return true;
}
@@ -120,8 +116,6 @@ function deleteTableRow(rowId){
element.parentNode.removeChild(element);
renumberTableRows();
-// alert(rowId);
-
}
@@ -133,22 +127,10 @@ function countRows(){
function showAlert(text) {
-
$K.app.message.show( { message: `${text}`, position: 'centered', type: 'is-error' });
- return;
-
}
-function reset2()
-{
-// document.getElementById("a_type").value="";
- document.getElementById("a_description").value="";
- document.getElementById("a_amount").value="";
- setUploadField();
-
-}
-
function setTableRow(id)
{
@@ -220,7 +202,6 @@ function getRow(rid,num) {
onclick="deleteTableRow(${rid})"
class="close is-large">
`;
-
}
@@ -238,144 +219,8 @@ function addRow() {
nextRid++;
}
-function xaddTableRow(){
-
- var $node = $K.dom('#tabbody');
- // create a new table row with id
- var element = document.createElement('tr');
- element.setAttribute("id", "trow"+currentRowId);
-
-
-/* var a_type = document.getElementById("a_type").value;
- if (!a_type.trim().length ) {
- document.getElementById("a_type").focus();
- showAlert("Bitte gib eine Auslagenart an!");
- return;
- }
-*/
-
-
- var a_date = document.getElementById("a_date").value;
- if (!a_date.trim().length){
- document.getElementById("a_date").focus();
- showAlert("Bitte gib ein gültiges Datum an!");
- return;
- }
-
-
- var a_description = document.getElementById("a_description").value;
- if (!a_description.trim().length){
- document.getElementById("a_description").focus();
- showAlert("Bitte gib eine Beschreibung ein!");
- return;
- }
-
- var a_amount = document.getElementById("a_amount").value;
- if (!isFloat(a_amount)){
- document.getElementById("a_amount").focus();
- showAlert("Bitte gib einen gültigen Betrag ein!");
- return;
- }
- a_amount = parseFloat(a_amount).toFixed(2);
-
-
- var a_currency = document.getElementById("a_currency").value;
-/* if (!a_currency.trim().length){
- document.getElementById("a_currency").focus();
- showAlert("Bitte gib eine Währung an!");
- return;
- }
-*/
- var target = document.getElementById("upload-target"+currentRowId);
- var children = target.children;
-
- if (!children.length){
-// showAlert("Bitte lade mindestens einen Beleg hoch!");
-// return;
- }
-
-
-
-/* a_type = "Hello";*/
-
- var e="
| ";
-
- // add column for position no
-// e += `${a_type}
-// | `;
-
- // add coluemn for a_type (Auslagenart)
-// e += ` | `;
- e += `${a_date}
- | `;
-
-
- // add column for date
-// e += ` | `;
- e += `${a_description}
- | `;
-
-
- // add column for num
- e += `${a_amount} EUR
- | `;
-
-
-
- // add column for file upload
-/* e+= `
-
-
- |
-*/
- var ulfiles = children.length;
- e += `${ulfiles} | `;
-
-// `;
- // add delete bnutton
- e +=
- `
- | `;
-
-
- $node.append(element);
- element.innerHTML=(e);
- renumberTableRows();
- currentRowId++;
- reset2();
-
-}
-
-
-
-function setUploadField()
-{
- var e = $K.dom('#uploadfield');
- var uf =`Beleg(e) hochladen
-
-
-
- `;
- document.getElementById("uploadfield").innerHTML=uf;
-}
$K.add('module', 'kaform', {
init: function(app, context)
@@ -394,8 +239,6 @@ $K.add('module', 'kaform', {
console.log(banktype);
-
-
// console.log(sender);
// this.message.show({ message: 'My message' });
}
@@ -423,8 +266,6 @@ $K.ajax.get({
error: function(response) {}
});
-setUploadField();
-
function check_field(fieldid,message){
var f = document.getElementById(fieldid).value;
@@ -500,6 +341,12 @@ function downloadDocument(mail)
return;
}
+ if (!document.getElementById("agree").checked){
+ document.getElementById("agree").focus();
+ showAlert("Bitte bestätige, dass du alle Angaben nach bestem Wissen und Gewissen gemacht hast!");
+ return;
+ };
+
if (mail){
if (!isMailable()){
@@ -519,12 +366,6 @@ function downloadDocument(mail)
document.getElementById('banktype').value=banktype;
document.getElementById("theform").submit();
- if (!document.getElementById("agree").checked){
- document.getElementById("agree").focus();
- showAlert("Bitte bestätige, dass du alle Angaben nach bestem Wissen und Gewissen gemacht hast!");
- return;
- };
-
}
diff --git a/submit.php b/submit.php
index 5ae97f9..878e75a 100644
--- a/submit.php
+++ b/submit.php
@@ -13,31 +13,31 @@ require "PHPMailer/Exception.php";
require_once('TCPDF/tcpdf.php');
class kaformPDF extends TCPDF {
- //Page header
+ //Page header
public function Header() {
}
- // // Logo
- // $image_file = K_PATH_IMAGES.'logo_example.jpg';
- // $this->Image($image_file, 10, 10, 15, '', 'JPG', '', 'T', false, 300, '', false, false, 0, false, false, false);
- // // Set font
- // $this->SetFont('helvetica', 'B', 20);
- // // Title
- // $this->Cell(0, 15, '<< TCPDF Example 003 >>', 0, false, 'C', 0, '', 0, false, 'M', 'M');
- // }
- //
- // // Page footer
+ // Logo
+ // $image_file = K_PATH_IMAGES.'logo_example.jpg';
+ // $this->Image($image_file, 10, 10, 15, '', 'JPG', '', 'T', false, 300, '', false, false, 0, false, false, false);
+ // // Set font
+ // $this->SetFont('helvetica', 'B', 20);
+ // // Title
+ // $this->Cell(0, 15, '<< TCPDF Example 003 >>', 0, false, 'C', 0, '', 0, false, 'M', 'M');
+ // }
+
+ // Page footer
public function Footer() {
}
- // // Position at 15 mm from bottom
- // $this->SetY(-15);
- // // Set font
- // $this->SetFont('helvetica', 'I', 8);
- // // Page number
- // $this->Cell(0, 10, 'Page '.$this->getAliasNumPage().'/'.$this->getAliasNbPages(), 0, false, 'C', 0, '', 0, false, 'T', 'M');
- // }
- // }
- //
+ // Position at 15 mm from bottom
+ // $this->SetY(-15);
+ // Set font
+ // $this->SetFont('helvetica', 'I', 8);
+ // Page number
+ // $this->Cell(0, 10, 'Page '.$this->getAliasNumPage().'/'.$this->getAliasNbPages(), 0, false, 'C', 0, '', 0, false, 'T', 'M');
+ // }
+ // }
+ //
};
@@ -296,7 +296,6 @@ function calcSum(){
}
$sum -= get_adv();
return str_replace(".",",",sprintf("%0.2f",$sum));
-// return sprintf("%.2f",$sum);
}