diff --git a/notemyprogress/classes/metareflexion.php b/notemyprogress/classes/metareflexion.php
index dbca6afca7354dffc33eeadbe18797eb8036a190..aa9b7b217660f02559b5a7ddd7657419b9d38e51 100644
--- a/notemyprogress/classes/metareflexion.php
+++ b/notemyprogress/classes/metareflexion.php
@@ -56,7 +56,7 @@ class metareflexion
public function get_days_committed($id_module)
{
global $DB;
- $sql = "select d.description from {notemyprogress_days} d,{notemyprogress_days_modules} dm where d.id = dm.id_days and dm.id_course_modules = ?";
+ $sql = "select dm.description from {notemyprogress_days_modules} dm where dm.id_course_modules = ?";
$days = $DB->get_records_sql($sql, array($id_module));
return $days;
}
@@ -97,7 +97,7 @@ class metareflexion
if (empty($this->past_week)) {
return null;
} else {
- $sql = "select * from {st_rpt_work_last_weeks} where weekcode = ? and userid = ? order by id desc limit 1";
+ $sql = "select * from {notemyprogress_last_weeks} where weekcode = ? and userid = ? order by id desc limit 1";
$last_week_query = $DB->get_record_sql($sql, array($this->past_week->weekcode, $this->user->id));
if (!empty($last_week_query)) {
$last_week = $last_week_query;
@@ -115,7 +115,7 @@ class metareflexion
private function find_questions($last_week)
{
global $DB;
- $sql = "select * from {st_rpt_questions}";
+ $sql = "select * from {notemyprogress_questions}";
$questions = $DB->get_records_sql($sql);
foreach ($questions as $key => $question) {
$answers = self::find_answers($question->id);
@@ -165,7 +165,7 @@ class metareflexion
public function find_answers($id_questions)
{
global $DB;
- $sql = "select * from {st_rpt_answers} where questionid = ?";
+ $sql = "select * from {notemyprogress_answers} where questionid = ?";
$answers = $DB->get_records_sql($sql, array($id_questions));
return $answers;
}
@@ -257,7 +257,7 @@ class metareflexion
public function get_schedules($weekcode)
{
global $DB;
- $sql = "select * from {st_rpt_weekly_schedules} where userid = ? and weekcode = ?";
+ $sql = "select * from {notemyprogress_wk} where userid = ? and weekcode = ?";
$cm_week_schedules = $DB->get_record_sql($sql, array($this->user->id, $weekcode));
return $cm_week_schedules;
}
@@ -274,7 +274,7 @@ class metareflexion
}
global $DB;
- //Add the weekly schedule to the st_rpt_weekly_schedules table
+ //Add the weekly schedule to the notemyprogress_wk table
$metareflexion = new stdClass();
$metareflexion->userid = $this->user->id;
$metareflexion->weekcode = $this->weekcode;
@@ -282,7 +282,7 @@ class metareflexion
$metareflexion->hours = $this->hours;
$metareflexion->timecreated = self::now_timestamp();
$metareflexion->timemodified = self::now_timestamp();
- $meta = $DB->insert_record("st_rpt_weekly_schedules", $metareflexion, true);
+ $meta = $DB->insert_record("notemyprogress_wk", $metareflexion, true);
//Add goals committed to the notemyprogress_goals table
foreach ($this->goals_committed as $key => $id_goal_cat) {
@@ -297,17 +297,20 @@ class metareflexion
//Create days in notemyprogress_days table
$day_descriptions = array("monday", "tuesday", "wednesday", "thursday", "friday", 'saturday', 'sunday');
$d_array = json_decode($this->days, true);
- foreach ($day_descriptions as $day_description) {
+ foreach ($day_descriptions as $day_desc) {
$day = new stdClass();
$day->userid = $this->user->id;
$day->id_weekly_schedules = $meta;
- $day->description = $day_description;
- $id_day = $DB->insert_record("notemyprogress_days", $day, true);
+ $day->description = $day_desc;
+ //$id_day = $DB->insert_record("notemyprogress_days", $day, true);
//Create an entry in notemyprogress_days_modules table for each day and module associated
- foreach ($d_array[$day_description] as $key => $id_module) {
+ foreach ($d_array[$day_desc] as $key => $id_module) {
$days_modules = new stdClass();
$days_modules->id_course_modules = $id_module;
- $days_modules->id_days = $id_day;
+ //$days_modules->id_days = $id_day;
+ $days_modules->id_weekly_schedules = $meta;
+ $days_modules->day_description = $day_desc;
+
$DB->insert_record("notemyprogress_days_modules", $days_modules, true);
}
}
@@ -333,7 +336,7 @@ class metareflexion
$metareflexion->id = $this->metareflexionid;
$metareflexion->hours = $this->hours;
$metareflexion->timemodified = self::now_timestamp();
- $sql = "update {st_rpt_weekly_schedules} set hours = ?, timemodified = ? where id = ?";
+ $sql = "update {notemyprogress_wk} set hours = ?, timemodified = ? where id = ?";
$result = $DB->execute($sql, array($this->hours, self::now_timestamp(), $this->metareflexionid));
// //delete or add goals committed to the notemyprogress_goals table
@@ -374,18 +377,21 @@ class metareflexion
}
//Delete previous notemyprogress_days_modules entries
- $sql = "delete from {notemyprogress_days_modules} where id_days in (Select id from {notemyprogress_days} where id_weekly_schedules = ?) ";
+ $sql = "delete from {notemyprogress_days_modules} where id_weekly_schedules = ?";
$result = $DB->execute($sql,array($metareflexion->id));
//Add entries
$d_array = json_decode($this->days, true);
- foreach ($d_array as $key => $day) {
- $sql = "select id from {notemyprogress_days} where id_weekly_schedules = ? and description = ? ";
- $id_day = $DB->get_record_sql($sql, array($this->metareflexionid, $key));
+ foreach ($d_array as $key_day => $day) {
+ //$sql = "select id from {notemyprogress_days} where id_weekly_schedules = ? and description = ? ";
+ //$id_day = $DB->get_record_sql($sql, array($this->metareflexionid, $key));
//Create an entry in notemyprogress_days_modules table for each day and module associated
foreach ($day as $key => $id_module) {
$days_modules = new stdClass();
$days_modules->id_course_modules = $id_module;
- $days_modules->id_days = $id_day->id;
+ $days_modules->id_weekly_schedules = $this->metareflexionid;
+ $days_modules->day_description = $key_day;
+
+ //$days_modules->id_days = $id_day->id;
$DB->insert_record("notemyprogress_days_modules", $days_modules, true);
}
}
@@ -410,7 +416,7 @@ class metareflexion
$lastweek->previous_class_learning = $this->previous_class_learning;
$lastweek->benefit_going_class = $this->benefit_going_class;
$lastweek->feeling = $this->feeling;
- $id = $DB->insert_record("st_rpt_work_last_weeks", $lastweek, true);
+ $id = $DB->insert_record("notemyprogress_last_weeks", $lastweek, true);
$lastweek->id = $id;
return $lastweek;
}
@@ -434,7 +440,7 @@ class metareflexion
$lastweek->previous_class_learning = $this->previous_class_learning;
$lastweek->benefit_going_class = $this->benefit_going_class;
$lastweek->feeling = $this->feeling;
- $sql = "update {st_rpt_work_last_weeks} set classroom_hours = ?, hours_off_course = ?,objectives_reached = ?, previous_class_learning = ?, benefit_going_class = ? ,feeling = ? where id = ?";
+ $sql = "update {notemyprogress_last_weeks} set classroom_hours = ?, hours_off_course = ?,objectives_reached = ?, previous_class_learning = ?, benefit_going_class = ? ,feeling = ? where id = ?";
$result = $DB->execute($sql, array($lastweek->classroom_hours, $lastweek->hours_off_course,$lastweek->objectives_reached ,$lastweek->previous_class_learning, $lastweek->benefit_going_class,$lastweek->feeling, $lastweek->id));
return $lastweek;
}
diff --git a/notemyprogress/classes/report.php b/notemyprogress/classes/report.php
index a4f6798c13705898f5a00cdd535b8591e974f850..5728f7fa256282e32a8cca8972481068457469a2 100644
--- a/notemyprogress/classes/report.php
+++ b/notemyprogress/classes/report.php
@@ -130,7 +130,7 @@ abstract class report
private function find_questions($last_week)
{
global $DB;
- $sql = "select * from {st_rpt_questions}";
+ $sql = "select * from {notemyprogress_questions}";
$questions = $DB->get_records_sql($sql);
foreach ($questions as $key => $question) {
$answers = self::find_answers($question->id);
@@ -179,20 +179,20 @@ abstract class report
public function find_answers($id_question)
{
global $DB;
- $sql = "select * from {st_rpt_answers} where questionid = ?";
+ $sql = "select * from {notemyprogress_answers} where questionid = ?";
$answers = $DB->get_records_sql($sql, array($id_question));
return $answers;
}
/**
- * Find the st_rpt_work_last_weeks entry corresponding to a weekcode
+ * Find the notemyprogress_last_weeks entry corresponding to a weekcode
*
* @param string $weekcode identifier of the week
* @return object the answer for the question id
*/
public function get_last($weekcode){
global $DB;
- $sql = "select * from {st_rpt_work_last_weeks} where weekcode = ? and userid = ? order by id desc limit 1";
+ $sql = "select * from {notemyprogress_last_weeks} where weekcode = ? and userid = ? order by id desc limit 1";
$last_week_query = $DB->get_record_sql($sql, array($weekcode, $this->user->id));
return $last_week_query;
}
@@ -208,7 +208,7 @@ abstract class report
global $DB;
$weeks = $this->weeks;
$array_ws = [];
- $sql = "select * from {st_rpt_weekly_schedules} where userid = ?";
+ $sql = "select * from {notemyprogress_wk} where userid = ?";
$week_schedules = $DB->get_records_sql($sql, array($this->user->id));
foreach($weeks as $week){
$array_ws[$week->weekcode] = false;
@@ -1147,7 +1147,7 @@ abstract class report
private function get_schedule($weekcode)
{
global $DB;
- $planifications = $DB->get_records('st_rpt_weekly_schedules', array('weekcode' => $weekcode,'userid' => $this->user->id));
+ $planifications = $DB->get_records('notemyprogress_wk', array('weekcode' => $weekcode,'userid' => $this->user->id));
return reset($planifications);
}
@@ -1289,7 +1289,7 @@ abstract class report
protected function get_modules_days_by_week($weekcode)
{
global $DB;
- $sql = "select dm.id, dm.id_course_modules cmid, d.description daydesc from {notemyprogress_days_modules} dm,{notemyprogress_days} d, {st_rpt_weekly_schedules} ws where dm.id_days = d.id and d.id_weekly_schedules = ws.id and ws.weekcode = ? and ws.userid = ? ";
+ $sql = "select dm.id, dm.id_course_modules cmid, dm.day_description daydesc from {notemyprogress_days_modules} dm, {notemyprogress_wk} ws where dm.id_weekly_schedules = ws.id and ws.weekcode = ? and ws.userid = ? ";
$mods_weeks = $DB->get_records_sql($sql, array($weekcode,$this->user->id));
return $mods_weeks;
}
@@ -1398,7 +1398,7 @@ abstract class report
public function get_goals_id($week_schedule)
{
global $DB;
- $sql = "select g.id_goals_categories from {notemyprogress_goals} g,{st_rpt_weekly_schedules} ws where g.id_weekly_schedules = ws.id and g.id_weekly_schedules = ? and ws.userid = ? ";
+ $sql = "select g.id_goals_categories from {notemyprogress_goals} g,{notemyprogress_wk} ws where g.id_weekly_schedules = ws.id and g.id_weekly_schedules = ? and ws.userid = ? ";
$goals_res = array_values($DB->get_records_sql($sql, array($week_schedule->id,$this->user->id)));
$arr_goal = [];
foreach($goals_res as $key=>$id_obj){
@@ -1476,7 +1476,7 @@ abstract class report
return 0;
}
list($in, $invalues) = $DB->get_in_or_equal($this->users);
- $sql = "select * from {st_rpt_weekly_schedules} where weekcode = ? and userid $in";
+ $sql = "select * from {notemyprogress_wk} where weekcode = ? and userid $in";
$params = array_merge(array($week->weekcode), $invalues);
$week_schedules = $DB->get_records_sql($sql, $params);
$result = self::calculate_average("hours", $week_schedules);
@@ -1526,7 +1526,7 @@ abstract class report
}
list($in, $invalues) = $DB->get_in_or_equal($this->users);
- $sql = "select * from {st_rpt_work_last_weeks} where weekcode = ? and userid $in";
+ $sql = "select * from {notemyprogress_last_weeks} where weekcode = ? and userid $in";
$params = array_merge(array($week->weekcode), $invalues);
$presence_clases = $DB->get_records_sql($sql, $params);
@@ -1556,7 +1556,7 @@ abstract class report
}
list($in, $invalues) = $DB->get_in_or_equal($this->users);
- $sql = "select * from {st_rpt_work_last_weeks} where weekcode = ? and userid $in";
+ $sql = "select * from {notemyprogress_last_weeks} where weekcode = ? and userid $in";
$params = array_merge(array($week->weekcode), $invalues);
$presence_clases = $DB->get_records_sql($sql, $params);
@@ -1600,16 +1600,16 @@ abstract class report
/**
- * Get questions from the st_rpt_questions table for a specific week
+ * Get questions from the notemyprogress_questions table for a specific week
*
* @param object $week code of the week specified
*
- * @return object questions from the st_rpt_questions table
+ * @return object questions from the notemyprogress_questions table
*/
private function get_work_last_week($week)
{
global $DB;
- $sql = "select * from {st_rpt_questions}";
+ $sql = "select * from {notemyprogress_questions}";
$questions = $DB->get_records_sql($sql);
$questions = self::add_question_alternatives($questions, $week);
return $questions;
@@ -1637,8 +1637,8 @@ abstract class report
array_push($params, $week->weekcode);
$params = array_merge($params, $invalues);
array_push($params, $question->id);
- $sql = "select a.*, (select count(*) from {st_rpt_work_last_weeks} where weekcode = ? and userid $in and (objectives_reached = a.id or previous_class_learning = a.id or benefit_going_class = a.id or feeling = a.id)) as count_selections
- from {st_rpt_answers} a where a.questionid = ?";
+ $sql = "select a.*, (select count(*) from {notemyprogress_last_weeks} where weekcode = ? and userid $in and (objectives_reached = a.id or previous_class_learning = a.id or benefit_going_class = a.id or feeling = a.id)) as count_selections
+ from {notemyprogress_answers} a where a.questionid = ?";
$answers = $DB->get_records_sql($sql, $params);
foreach ($answers as $key => $answer) {
$answer->enunciated = get_string($answer->enunciated, "local_notemyprogress");
diff --git a/notemyprogress/db/install.php b/notemyprogress/db/install.php
index f882841f9cfe0e75e5d38600b0e4a8b731ad7789..2b8a121e78cf689ca7a4f13142cb9fc22d3788e7 100644
--- a/notemyprogress/db/install.php
+++ b/notemyprogress/db/install.php
@@ -42,118 +42,103 @@ function xmldb_local_notemyprogress_install()
$DB->insert_record("notemyprogress_goals_ct", $goal2, true);
$DB->insert_record("notemyprogress_goals_ct", $goal3, true);
- //Create questions
- $question1 = new stdClass();
- $question2 = new stdClass();
- $question3 = new stdClass();
- $question4 = new stdClass();
- $question1->description = "question1";
- $question2->description = "question2";
- $question3->description = "question3";
- $question4->description = "question3";
- $DB->insert_record("notemyprogress_questions_ct", $question1, true);
- $DB->insert_record("notemyprogress_questions_ct", $question2, true);
- $DB->insert_record("notemyprogress_questions_ct", $question3, true);
- $DB->insert_record("notemyprogress_questions_ct", $question4, true);
-
-
//Question 1
$question = new stdClass();
$question->enunciated = 'question_number_one';
- $questionid = $DB->insert_record("st_rpt_questions", $question, true);
+ $questionid = $DB->insert_record("notemyprogress_questions", $question, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_one_option_one';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_one_option_two';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
//Question 2
$question = new stdClass();
$question->enunciated = 'question_number_two';
- $questionid = $DB->insert_record("st_rpt_questions", $question, true);
+ $questionid = $DB->insert_record("notemyprogress_questions", $question, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_two_option_one';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_two_option_two';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_two_option_three';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
//Question 3
$question = new stdClass();
$question->enunciated = 'question_number_three';
- $questionid = $DB->insert_record("st_rpt_questions", $question, true);
+ $questionid = $DB->insert_record("notemyprogress_questions", $question, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_one';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_two';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_three';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_four';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_five';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_three_option_six';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
//Question 4
$question = new stdClass();
$question->enunciated = 'question_number_four';
- $questionid = $DB->insert_record("st_rpt_questions", $question, true);
+ $questionid = $DB->insert_record("notemyprogress_questions", $question, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_four_option_one';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_four_option_two';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_four_option_three';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
$answer = new stdClass();
$answer->questionid = $questionid;
$answer->enunciated = 'answers_number_four_option_four';
- $DB->insert_record("st_rpt_answers", $answer, true);
+ $DB->insert_record("notemyprogress_answers", $answer, true);
}
\ No newline at end of file
diff --git a/notemyprogress/db/install.xml b/notemyprogress/db/install.xml
index 61b51441ca44979aba5fbd8a5477ee631f2183e9..717619297c41d4b1cf15298b14f8fb7e2bbc4634 100644
--- a/notemyprogress/db/install.xml
+++ b/notemyprogress/db/install.xml
@@ -36,7 +36,7 @@
<INDEX NAME="instanceid" UNIQUE="false" FIELDS="instanceid" HINTS="instanceid" COMMENT="instanceid index"/>
</INDEXES>
</TABLE>
- <TABLE NAME="st_rpt_weekly_schedules" COMMENT="table st_rpt_weekly_schedules">
+ <TABLE NAME="notemyprogress_wk" COMMENT="table notemyprogress_wk">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
@@ -49,7 +49,7 @@
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
</KEYS>
</TABLE>
- <TABLE NAME="st_rpt_work_last_weeks" COMMENT="table st_rpt_work_last_weeks">
+ <TABLE NAME="notemyprogress_last_weeks" COMMENT="table notemyprogress_last_weeks">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
@@ -84,45 +84,13 @@
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
</KEYS>
</TABLE>
- <TABLE NAME="notemyprogress_questions" COMMENT="table notemyprogress_questions">
- <FIELDS>
- <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
- <FIELD NAME="id_questions_categories" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="weekcode" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="answer" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false"/>
- </FIELDS>
- <KEYS>
- <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
- </KEYS>
- </TABLE>
- <TABLE NAME="notemyprogress_questions_ct" COMMENT="table notemyprogress_questions_ct">
- <FIELDS>
- <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
- <FIELD NAME="description" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
- </FIELDS>
- <KEYS>
- <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
- </KEYS>
- </TABLE>
- <TABLE NAME="notemyprogress_days" COMMENT="table notemyprogress_days">
- <FIELDS>
- <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
- <FIELD NAME="id_weekly_schedules" TYPE="int" LENGTH="20" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="description" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
- </FIELDS>
- <KEYS>
- <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
- </KEYS>
- </TABLE>
<TABLE NAME="notemyprogress_days_modules" COMMENT="table notemyprogress_days_modules">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="id_course_modules" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
- <FIELD NAME="id_days" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+ <FIELD NAME="id_weekly_schedules" TYPE="int" LENGTH="20" NOTNULL="true" SEQUENCE="false"/>
+ <FIELD NAME="day_description" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
@@ -130,7 +98,7 @@
</TABLE>
- <TABLE NAME="st_rpt_questions" COMMENT="table st_rpt_questions">
+ <TABLE NAME="notemyprogress_questions" COMMENT="table notemyprogress_questions">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="enunciated" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
@@ -139,7 +107,7 @@
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
</KEYS>
</TABLE>
- <TABLE NAME="st_rpt_answers" COMMENT="table st_rpt_answers">
+ <TABLE NAME="notemyprogress_answers" COMMENT="table notemyprogress_answers">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="questionid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>