fixed get task for ta users

Dunni · Nov 30, 2013 · 2d43a5e · 2d43a5e
1 parent 788fdc2
commit 2d43a5e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ServerSide/TAEvalServer/Storage/PersistImpSQL.cpp b/ServerSide/TAEvalServer/Storage/PersistImpSQL.cpp
@@ -224,7 +224,7 @@ bool PersistImpSQL::getTasksForTA(QString info, QString TAKey, QList<Task> *&lis
 
     /* for TA*/
     if(role.compare("TA") == 0){
-        queryString = QString("SELECT * FROM TASKS WHERE TAName = '%1' AND CourseName in (select name from COURSES join TACOURSES on COURSES.name = TACOURSES.CourseName where TAName = '%1'' and term = '%2')").\
+        queryString = QString("SELECT * FROM TASKS WHERE TAName = '%1' AND CourseName in (select name from COURSES join TACOURSES on COURSES.name = TACOURSES.CourseName where TAName = '%1' and term = '%2')").\
                 arg(TAKey).arg(info);
     }
 

diff --git a/ServerSide/TAEvalServer/Storage/taeval.db b/ServerSide/TAEvalServer/Storage/taeval.db
diff --git a/ServerSide/TAEvalServer/TAEvalServer.pro b/ServerSide/TAEvalServer/TAEvalServer.pro
@@ -9,7 +9,7 @@ QT       += core sql network
 TARGET = TAEvalServer
 TEMPLATE = app
 
-
+DEFINES += QT_NO_DEBUG_OUTPUT
 
 SOURCES += main.cpp\
     ../../Common/task.cpp \

diff --git a/ServerSide/TAEvalServer/taeval.cpp b/ServerSide/TAEvalServer/taeval.cpp
@@ -58,7 +58,6 @@ bool TAEval::getSemesters(QString userID, StringList *&list) // User MUST delete
     if(accessControl.isLoggedIn(userID) && (accessControl.getUser(userID)->getUserType() == "Instructor" || accessControl.getUser(userID)->getUserType() == "TA"))
     {
         list = new StringList(dataStore.getSemesters(userID));
-        qDebug() << *list;
         return true;
     }
     return false;
@@ -100,8 +99,11 @@ bool TAEval::getTasks(QString userID, QString course, QString ta, TaskList *&lis
 {
     if(accessControl.isLoggedIn(userID) && (accessControl.getUser(userID)->getUserType() == "Instructor" || accessControl.getUser(userID)->getUserType() == "TA"))
     {
-        return dataStore.getTasksForTA(course,ta,list,accessControl.getUser(userID)->getUserType());
+        bool b = dataStore.getTasksForTA(course,ta,list,accessControl.getUser(userID)->getUserType());
+        //qDebug() << Task::listToString(*list);
+        return b;
     }
+    qDebug() << "no access";
     return false;
 }