Moved queries to DAO

Author: davidpbauer

AddCard.php

@@ -1,13 +1,18 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
+require_once "util/FlashcardUtils.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -18,8 +23,11 @@
 
     $setId = $_GET["SetID"];
 
-    $cardsInSet = $PDOX->allRowsDie("SELECT * FROM {$p}flashcards where SetID=".$setId." order by CardNum;");
-    $set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+    $cardsInSet = $flashcardsDAO->getCardsInSet($setId);
+
+    usort($cardsInSet, array('FlashcardUtils', 'compareCardNum'));
+
+    $set = $flashcardsDAO->getFlashcardSetById($setId);
 
     $Total = count($cardsInSet);
     $Next = $Total + 1;

AllCards.php

@@ -1,13 +1,18 @@
 <?php
 require_once "../config.php";
+require_once('dao/FlashcardsDAO.php');
+require_once('util/FlashcardUtils.php');
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -18,8 +23,9 @@
 
     $setId = $_GET["SetID"];
 
-    $cardsInSet = $PDOX->allRowsDie("SELECT * FROM {$p}flashcards where SetID=".$setId." order by CardNum;");
-    $set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+    $cardsInSet = $flashcardsDAO->getCardsInSet($setId);
+
+    $set = $flashcardsDAO->getFlashcardSetById($setId);
 
     $Total = count($cardsInSet);
 
@@ -34,7 +40,7 @@
         <div class="row cardRow">
 
         <p>
-            <a class="btn btn-success" href="AddCard.php?SetID='.$_GET["SetID"].'"><span class="fa fa-plus"></span> Add New Card</a>        
+            <a class="btn btn-success" href="AddCard.php?SetID='.$setId.'"><span class="fa fa-plus"></span> Add New Card</a>        
         </p>
         
         <h2>Cards in "'.$set["CardSetName"].'" <span class="badge">'.$Total.' Cards</span></h2>
@@ -43,6 +49,7 @@
     if ($Total == 0) {
         echo('<p><em>There are currently no cards in this set.</em></p>');
     } else {
+        usort($cardsInSet, array('FlashcardUtils', 'compareCardNum'));
         $cardNum = 1;
         foreach ( $cardsInSet as $row ) {
 

EditCard.php

@@ -1,13 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -18,8 +22,9 @@
 
     $setId = $_GET["SetID"];
 
-    $set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
-    $card = $PDOX->rowDie("SELECT * FROM {$p}flashcards where CardID=".$_GET["CardID"].";");
+    $set = $flashcardsDAO->getFlashcardSetById($setId);
+
+    $card = $flashcardsDAO->getCardById($_GET["CardID"]);
 
     include("menu.php");
 

FinishedReview.php

@@ -1,13 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -40,7 +44,7 @@
 $setId = $_GET["SetID"];
 $_SESSION["SetID"] = $setId;
 
-$set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+$set = $flashcardsDAO->getFlashcardSetById($setId);
 
 if ($shortCut == 0) {
     echo('

LinkToSet.php

@@ -1,13 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -20,9 +24,9 @@
 
     include("menu.php");
 
-    $allSets = $PDOX->allRowsDie("select * from {$p}flashcards_set where CourseName='".$_SESSION["CourseName"]."' order by CardSetName;");
+    $allSets = $flashcardsDAO->getAllSetsForSiteSorted($CONTEXT->id);
 
-    $previousLink = $PDOX->rowDie("SELECT * FROM {$p}flashcards_link WHERE link_id ='".$linkId."';");
+    $previousLink = $flashcardsDAO->getLinkedSet($linkId);
 
     echo('<form action="actions/LinkToSet_Submit.php" method="post">
 

PlayCard.php

@@ -1,28 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
+require_once "util/FlashcardUtils.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
-// Comparator for card number
-function compareCardNum2($a, $b) {
-
-    if ($a["CardNum2"] == $b["CardNum2"]) {
-        return 0;
-    }
-    return ($a["CardNum2"] < $b["CardNum2"]) ? -1 : 1;
-}
-function compareCardNum($a, $b) {
-
-    if ($a["CardNum"] == $b["CardNum"]) {
-        return 0;
-    }
-    return ($a["CardNum"] < $b["CardNum"]) ? -1 : 1;
-}
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
 
 $OUTPUT->header();
 
@@ -73,15 +62,15 @@ function compareCardNum($a, $b) {
 $setId = $_GET["SetID"];
 $_SESSION["SetID"] = $setId;
 
-$cardsInSet = $PDOX->allRowsDie("SELECT * FROM {$p}flashcards where SetID=".$setId.";");
+$cardsInSet = $flashcardsDAO->getCardsInSet($setId);
 
 if($CardNum == 0){
-    $theCard = $PDOX->rowDie("SELECT * FROM {$p}flashcards where SetID=".$setId." AND CardNum2=".$CardNum2.";");
+    $theCard = $flashcardsDAO->getCardBySetAndNumber2($setId, $CardNum2);
 } else {
-    $theCard = $PDOX->rowDie("SELECT * FROM {$p}flashcards where SetID=".$setId." AND CardNum=".$CardNum.";");
+    $theCard = $flashcardsDAO->getCardBySetAndNumber($setId, $CardNum);
 }
 
-$cardKnown = $PDOX->rowDie("SELECT * FROM {$p}flashcards_review WHERE UserId = '".$USER->id."' AND SetId ='".$setId."' AND CardId = '".$theCard["CardID"]."';");
+$cardKnown = $flashcardsDAO->cardKnown($USER->id, $setId, $theCard["CardID"]);
 
 if($isReviewMode == 1) {
 
@@ -91,7 +80,7 @@ function compareCardNum($a, $b) {
         header( 'Location: '.addSession('PlayCard.php?CardNum='.++$CardNum.'&CardNum2=0&Flag=A&SetID='.$setId.'&Shortcut='.$shortCut.'&ReviewMode='.$isReviewMode) ) ;
     }
 
-    $knownCards = $PDOX->allRowsDie("SELECT CardID FROM {$p}flashcards_review WHERE UserId = '".$USER->id."' AND SetId = '".$setId."';");
+    $knownCards = $flashcardsDAO->getKnownCards($USER->id, $setId);
 
     $knownCardIds = array();
 
@@ -114,12 +103,12 @@ function compareCardNum($a, $b) {
     header( 'Location: '.addSession('FinishedReview.php?SetID='.$setId.'&Shortcut='.$shortCut) ) ;
 }
 
-$set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+$set = $flashcardsDAO->getFlashcardSetById($setId);
 
 if ($CardNum == 0) {
     // We are in "shuffle" mode
 
-    usort($cardsInSet, "compareCardNum2");
+    usort($cardsInSet, array('FlashcardUtils', 'compareCardNum2'));
 
     $Next = 0;
     $Prev = 0;
@@ -151,7 +140,7 @@ function compareCardNum($a, $b) {
     $percentComplete = $position / $Total * 100;
 } else {
 
-    usort($cardsInSet, "compareCardNum");
+    usort($cardsInSet, array('FlashcardUtils', 'compareCardNum'));
 
     reset($cardsInSet);
     $position = 1;

Settings.php

@@ -1,13 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
+
 $OUTPUT->header();
 
 include("tool-header.html");
@@ -18,8 +22,11 @@
 
     $setId = $_GET["SetID"];
 
-    $cardsInSet = $PDOX->allRowsDie("SELECT * FROM {$p}flashcards where SetID=".$setId." order by CardNum;");
-    $set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+    $cardsInSet = $flashcardsDAO->getCardsInSet($setId);
+
+    usort($cardsInSet, array('FlashcardUtils', 'compareCardNum'));
+
+    $set = $flashcardsDAO->getFlashcardSetById($setId);
 
     $Total = count($cardsInSet);
 

Usage.php

@@ -1,17 +1,17 @@
 <?php
 require_once "../config.php";
+require_once "dao/FlashcardsDAO.php";
+require_once "util/FlashcardUtils.php";
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
-// Comparator for student last name used for sorting roster
-function compareStudentsLastName($a, $b) {
-    return strcmp($a["person_name_family"], $b["person_name_family"]);
-}
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
 
 $OUTPUT->header();
 
@@ -25,7 +25,7 @@ function compareStudentsLastName($a, $b) {
 
     $setId = $_GET["SetID"];
 
-    $set = $PDOX->rowDie("select * from {$p}flashcards_set where SetID=".$setId.";");
+    $set = $flashcardsDAO->getFlashcardSetById($setId);
 
     echo('
             <ul class="breadcrumb">
@@ -34,7 +34,7 @@ function compareStudentsLastName($a, $b) {
             </ul>
         ');
 
-    $cardsInSet = $PDOX->allRowsDie("SELECT * FROM {$p}flashcards where SetID=".$setId.";");
+    $cardsInSet = $flashcardsDAO->getCardsInSet($setId);
     $totalCards = count($cardsInSet);
 
     $hasRosters = LTIX::populateRoster(false);
@@ -59,7 +59,7 @@ function compareStudentsLastName($a, $b) {
                 echo('<div class="row">
                     <div class="col-sm-4">'.$student["person_name_family"].', '.$student["person_name_given"].'</div>');
 
-                $numberCompleted = $PDOX->rowDie("SELECT count(distinct(CardNum)) as Count FROM {$p}flashcards_activity WHERE FullName = '".$student["person_name_full"]."' AND SetID = '".$setId."';");
+                $numberCompleted = $flashcardsDAO->getNumberOfSeenCards($student["user_id"], $setId);
 
                 $percentComplete = $numberCompleted["Count"] / $totalCards * 100;
 

actions/AddActivity.php

@@ -1,21 +1,20 @@
 <?php
 require_once "../../config.php";
+require_once("../dao/FlashcardsDAO.php");
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
 $setId = $_SESSION["SetID"];
-$CardNum = $_SESSION["CardNum"];
-$UserName = $_SESSION["UserName"];
-$FullName = $_SESSION["FullName"];
+$cardId = $_SESSION["CardID"];
 
-$activity = $PDOX->rowDie("SELECT * FROM {$p}flashcards_activity where SetID='".$setId."' AND CardNum='".$CardNum."' AND UserName='".$UserName."';");
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
 
-if (!$activity) {
-    $PDOX->queryDie("INSERT INTO {$p}flashcards_activity (SetID, CardNum, UserName, FullName) VALUES ( $setId, $CardNum, '$UserName', '$FullName' );",
-        array(':SetID' => $setId, ':CardNum' => $CardNum, ':UserName' => $UserName,':FullName' => $FullName)  );
-}
+$flashcardsDAO->updateActivityForUserCard($setId, $cardId, $USER->id);
+
+exit;

actions/AddCardSet_Submit.php

@@ -1,23 +1,25 @@
 <?php
 require_once "../../config.php";
+require_once('../dao/FlashcardsDAO.php');
 
 use \Tsugi\Core\LTIX;
+use \Flashcards\DAO\FlashcardsDAO;
 
 // Retrieve the launch data if present
 $LAUNCH = LTIX::requireData();
 
 $p = $CFG->dbprefix;
 
-$UserName=$_SESSION["UserName"];
-$CourseName = $_POST["CourseName"];
-$CardSetName = $_POST["CardSetName"];
+$flashcardsDAO = new FlashcardsDAO($PDOX, $p);
 
-$CardSetName = str_replace("'", "&#39;", $CardSetName);
+$CardSetName = str_replace("'", "&#39;", $_POST["CardSetName"]);
 
 if ( $USER->instructor ) {
 
-    $PDOX->queryDie("INSERT INTO {$p}flashcards_set (UserName, CourseName, CardSetName) VALUES ( '$UserName', '$CourseName', '$CardSetName')",
-        array(':UserName' => $UserName, ':CourseName' => $CourseName, ':CardSetName' => $CardSetName)  );
+    $newSetId = $flashcardsDAO->createCardSet($USER->id, $CONTEXT->id, $CardSetName);
 
-    header( 'Location: '.addSession('../AllCards.php?SetID='.$PDOX->lastInsertId()) ) ;
+    header( 'Location: '.addSession('../AllCards.php?SetID='.$newSetId) ) ;
+} else {
+    // student so send back to index
+    header( 'Location: '.addSession('../index.php') ) ;
 }