Complete registration.

- Fix db.php functions
- Improve validations and status modal message on registerform.js
IS NEEDED SOME MINOR GRAPHICAL MODIFICATIONS IN FRON-PAGE

db/db.php

@@ -12,12 +12,14 @@
     }
 
     public function insert($registro){
-      $columns = implode(",", array_keys($registro));
+
-      echo $columns;
+
-      $sql = "INSERT INTO Registro ($columns)"
+      $sql = 'INSERT INTO Registro (nombre,apellido,titulo,afiliacion,ciudad,'
+                          .'pais,email,fechaLlegada,fechaPartida,financiacion,'
+                          ."invitado,cartaInvitacion,roomingPref,roommate,fechaRegistro)"
               .' VALUES (:nombre,:apellido,:titulo,:afiliacion,:ciudad,:pais,:email,:fechaLlegada,'
               .':fechaPartida,:financiacion,:invitado,:cartaInvitacion,:roomingPref,:roommate,:fechaRegistro);';
-      echo $sql;
+
       $stmt = $this->pdo->prepare($sql);
       $stmt->execute([
         ':nombre' => $registro['nombre'],
@@ -27,14 +29,14 @@
         ':ciudad' => $registro['ciudad'],
         ':pais' => $registro['pais'],
         ':email' => $registro['email'],
-        ':fechaLlegada' => $registro['fechaLlegada'],
+        ':fechaLlegada' => $registro['bda'],
-        ':fechaPartida' => $registro['fechaPartida'],
+        ':fechaPartida' => $registro['eda'],
         ':financiacion' => $registro['financiacion'],
-        ':invitado' => $registro['invitado'],
+        ':invitado' => $registro['invited'],
-        ':cartaInvitacion' => $registro['cartaInvitacion'],
+        ':cartaInvitacion' => $registro['letterinvited'],
-        ':roomingPref' => $registro['roomingPref'],
+        ':roomingPref' => $registro['roomtype'],
-        ':roommate' => $registro['roommate'],
+        ':roommate' => $registro['roomate'],
-        ':fechaRegistro' => $registro['fechaRegistro']
+        ':fechaRegistro' => $date = date('Y-m-d H:i:s'),
         ]);
       return $this->pdo->lastInsertId();
 
@@ -45,6 +47,13 @@
       return $stmt->fetchAll(\PDO::FETCH_BOTH);
 
     }
+    public function findByMail($email){
+      $stmt = $this->pdo->prepare("SELECT * FROM Registro WHERE email=:email");
+      $stmt->bindParam(":email",$email);
+      $stmt->execute();
+      return $result = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+    }
+
   }
 ?>
-        

public/js/registerform.js

@@ -1,8 +1,24 @@
 
+function showMsg(error,msg){
+
+	var msgTxt = $("#msgModal .modal-body .alert");
+	if(error){
+		msgTxt.removeClass("alert-success");
+		msgTxt.addClass("alert-danger");
+		msgTxt.html('<strong><span class="glyphicon glyphicon-remove-sign">'
+							+'</span>Error! </strong><br/>'+msg);
+	}
+	else{
+		msgTxt.removeClass("alert-danger");
+		msgTxt.addClass("alert-success");
+		msgTxt.html('<strong><span class="glyphicon glyphicon-ok-sign">'
+							+'</span>Success! </strong><br/>'+msg);
+	}
+	$("#msgModal").modal({show:true})
+}
 
 $().ready(function(){
 	$("#statusmsg").hide();
-	
 	$("#txtbda,#txteda").datepicker({
 
 		dateFormat: "dd/mm/yy",
@@ -14,8 +30,19 @@ $().ready(function(){
 		data: data.paises,
 		placeholder: "Select Country",
 		width: "100%",
+	});/*.one('select2-focus', select2Focus).on("select2-blur", function () {
+    $(this).one('select2-focus', select2Focus)
 	});
 
+function select2Focus() {
+    var select2 = $(this).data('select2');
+    setTimeout(function() {
+        if (!select2.opened()) {
+            select2.open();
+        }
+    }, 0);
+	}*/
+
 	$("#roomtype").select2({
 		data: data.roomtypes,
 		placeholder: "Select Rooming Preference",
@@ -47,6 +74,7 @@ $().ready(function(){
 			invited:{required:true},
 			financiacion:"required",
 			letterinvited:"required",
+			"g-recaptcha-response":"required"
 
 
 		},
@@ -62,7 +90,8 @@ $().ready(function(){
 			email: "Please enter a valid e-mail address",
 			invited: "Select one option please",
 			financiacion: "Select one option please",
-			letterinvited: "Select one option please"
+			letterinvited: "Select one option please",
+			'g-recaptcha-response': "Please validate reCAPTCHA",
 
 
 		},
@@ -71,12 +100,23 @@ $().ready(function(){
 			formdata.find(item => item.name === "pais").value = $("#pais").select2("data")[0].text;
 			formdata.find(item => item.name === "roomtype").value = $("#roomtype").select2("data")[0].text;
 			var parameters = $.param(formdata);
-			console.log(parameters);
+
 			var post = $.post('api/register', parameters);
 			post.done(function(data){
-				console.log(data);
+				if(data.success){
+
+					showMsg(false,data.msg);
+				}
+				else{
+					var errMsg = data.msg+"<ul>";
+					$.each(data.errors, function(k,v){
+						errMsg+="<li>"+v+"</li>";
+					});
+					errMsg+="</ul>";
+					console.log(errMsg);
+					showMsg(true,errMsg);
+				}
 			});
-			//console.log(parameters);
 
 		},
 		errorElement: "em",
@@ -118,24 +158,11 @@ $().ready(function(){
 			padre.addClass("has-success").removeClass("has-error");
 			iconstatus.addClass( "glyphicon-ok" ).removeClass( "glyphicon-remove" );
 			padre.addClass( "has-success" ).removeClass( "has-error" );
-		}    	
+		},
-    });
+    //});
 
-    var finan;
-	$('input:radio[name="financiacion"]').change(function(){
-		finan=true;
-		if($(this).is(':checked') && $(this).val() == "si"){
-			$("#detallefinan").show();			
-			$("#detallefinan textarea").addClass("has-error");			
-		}
-		else
-			$("#detallefinan").hide();
-		
-		$('#sifinan').tooltip("hide");
-	  	$('#sifinan').tooltip("destroy");
 	});
 
 
 
 });
-	

src/routes.php

@@ -62,24 +62,24 @@ $app->group('/api', function($app){
 	});
 
 	$app->post('/register', function (Request $request, Response $response, array $args) {
-	    // Sample log message
-	    //$this->logger->debug(var_dump($request->getParsedBody()));
 	    $db = new DB($this->db);
 	    $data = $request->getParsedBody();
       $messages = $this->flash;
-      if(!isset($data['nombre']))
+      if(!isset($data['nombre'])||empty($data['nombre']))
-        $messages->addMessageNow("submit-register-err", "First Name could not be empty");
+        $messages->addMessageNow("submit-register-err", "First name could not be empty");
-      if(!isset($data['apellido']))
+      if(!isset($data['apellido'])||empty($data['apellido']))
-        $messages->addMessageNow("submit-register-err", "Last Name could not be empty");
+        $messages->addMessageNow("submit-register-err", "Last name could not be empty");
-      if(!isset($data['email']))
+      if(!isset($data['email'])||empty($data['email']))
         $messages->addMessageNow("submit-register-err", "E-mail could not be empty");
-      if(!isset($data['financiacion']))
+      if(!isset($data['financiacion'])||!is_numeric($data['financiacion']))
         $messages->addMessageNow("submit-register-err", "Question about financial support must have a selected answer");
-      if(!isset($data['invited']))
+      if(!isset($data['invited'])||!is_numeric($data['invited']))
         $messages->addMessageNow("submit-register-err", "Question about 'invited to participate in this conference' must have a selected answer");
-      if(!isset($data['letterinvited']))
+      if(!isset($data['letterinvited'])||!is_numeric($data['letterinvited']))
         $messages->addMessageNow("submit-register-err", "Question about needing a letter of invitation must have a selected answer");
-      if(!isset($data['g-recaptcha-response'])){
+
+      //ReCaptcha Validation
+      if(!isset($data['g-recaptcha-response'])||empty($data['g-recaptcha-response'])){
         $messages->addMessageNow("submit-register-err", "Please validate captcha!");
       }
       else {
@@ -89,27 +89,34 @@ $app->group('/api', function($app){
         if(!$resp->isSuccess()){
           $messages->addMessageNow("submit-register-err", "ReCaptcha validation error " . implode($resp->getErrorCodes()));
         }
-      }
-
-      if($messages->hasMessage("submit-register-err")){
-
-        $arrayresponse = array("success" => false, "errors"=>$messages->getMessage("submit-register-err"), "data"=>$data);
-        $newres = $response->withJson($arrayresponse);
-        return $newres;
-      }
         else {
+          unset($data['g-recaptcha-response']);
+        }
+      }
 
-        /*try{
+      try{
+        if($db->findByMail($data['email']))
+          $messages->addMessageNow("submit-register-err", $data['email']." is already registered");
+        else
           $db->insert($data);
       }
       catch (Exception $e){
-        $this->logger->debug($e->getMessage());
+        $this->logger->debug("Submit register DB error: ".$e->getMessage());
-        return $e->getMessage();
+        $messages->addMessageNow("submit-register-err", "DB error: ".$e->getMessage());
-      }*/
-        echo "todo ok";
       }
 
-
+      if($messages->hasMessage("submit-register-err")){
+        $arrayresponse = array("success" => false,
+        "msg"=>"You registration could not be completed:\n",
+        "errors"=>$messages->getMessage("submit-register-err"), "data"=>$data);
+      }
+      else {
+        $arrayresponse = array("success" => true,
+        "msg"=>"You have been successfully registered to the GGDWorkshop",
+        "data"=>$data);
+      }
+      $newres = $response->withJson($arrayresponse);
+      return $newres;
 	});
 
 });

templates/registration.html

@@ -163,8 +163,8 @@
     <!--Captcha -->
     <div class="row">
       <div class="form-group col-xs-12">
-        <div id="testing" class="g-recaptcha" data-sitekey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"></div>
+        <div id="testing" class="input-container g-recaptcha" data-sitekey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"></div>
-        <!--<div class="g-recaptcha" data-sitekey="6LesRDsUAAAAAJvyoODvjiza9u75qEGJmbKHEV6s"></div>-->
+        <!--<div class="input-container g-recaptcha" data-sitekey="6LesRDsUAAAAAJvyoODvjiza9u75qEGJmbKHEV6s"></div>-->
       </div>
     </div>
 
@@ -175,36 +175,41 @@
       </div>
     </div>
   </form>
+  <div id="statusmsg" class="alert alert-error">
+    
+  </div>
 
 
-<!--{% if flash("submit-register-err") %}-->
+<!--{% if flash("submit-register-err") %}
     <div id="statusmsg" class="alert alert-error">
       <strong>Error!</strong>
       {% for msg in flash("submit-register-err") %}
        <kbd>{{ msg }}.</kdb>
       {% endfor %}
     </div>
-<!--  {% endif %}-->
+  {% endif %}-->
-  <!--<div id="myModal" class="modal fade" role="dialog">
+  <div id="msgModal" class="modal fade" role="dialog">
     <div class="modal-dialog">
 
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Revise sus datos cuidadosamente y confirme</h4>
+          <h4 class="modal-title">GGDWorkshop Registration</h4>
         </div>
         <div class="modal-body">
-          <p>Some text in the modal.</p>
+          <div class="alert">
 
           </div>
-        <div class="modal-footer">
+
+        </div>
+        <!--<div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Sí
           </button>
           <button type="button" class="btn btn-default" data-dismiss="modal">No
           </button>
-        </div>
+        </div>-->
       </div>
 
     </div>
-  </div>-->
+  </div>
 {% endblock %}