From 717193831df7a3c0653d92da6f9c83c74e203829 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 8 Feb 2020 19:38:13 -0500
Subject: [PATCH] fix

---
 www/application/config/constants.php          |  3 ++-
 www/application/controllers/Member.php        | 18 ++++++++++---
 .../views/member/addpages/NOTECARD.php        | 11 +++++---
 .../views/member/pages/manage_contents.php    | 12 +++++----
 .../views/member/pages/pages_OTHER.php        | 27 ++++++++++++++-----
 5 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/www/application/config/constants.php b/www/application/config/constants.php
index 37f2bf0..79fecd1 100644
--- a/www/application/config/constants.php
+++ b/www/application/config/constants.php
@@ -91,4 +91,5 @@ define('COREGRADE_ACCOUNT_PENDING',11010);
 define('COREGRADE_VERIFY_PENDING_LINK',11015);     
 define('COREGRADE_ACCOUNT_CREATEACC',11020);       
 define('COREGRADE_ACCOUNT_LOGIN',11025);      
-define('COREGRADE_ACCOUNT_ADDCARD', 11027);
\ No newline at end of file
+define('COREGRADE_ACCOUNT_ADDCARD', 11027);
+define('COREGRADE_ACCOUNT_ADDPAGECARD', 11029);
\ No newline at end of file
diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php
index 7b95322..274beda 100644
--- a/www/application/controllers/Member.php
+++ b/www/application/controllers/Member.php
@@ -51,11 +51,12 @@ class Member extends Member_Controller {
                     $data['title'] = $drow->title;
                     $data['description'] = $drow->description;
                     $data['what_page'] = $drow->page_mode;
-                    $data['page_id']= $drow->page_id;
+                    $data['page_id'] = $drow->page_id;
                     // now let us get the items for the page
 
 
-                    $mysql = "SELECT * FROM members_page_item WHERE member_id = " . $_SESSION["member_id"]." AND page_id = ".$data['page_id'];
+
+                    $mysql = "SELECT * FROM members_page_item WHERE member_id = " . $_SESSION["member_id"] . " AND page_id = " . $data['page_id'];
                     $r = $this->db->query($mysql);
                     $data["page_card_items"] = $r->result();
 
@@ -77,6 +78,8 @@ class Member extends Member_Controller {
 
             $action_name = $this->input->get('action_name');
             $member_id = $_SESSION["member_id"];
+            $data["page_id"] = $this->input->get('page_id');
+
             /*    if ($member_id > 0 && $page_key != '') {
               //echo 'yes';
               $mysql = "SELECT * FROM members_pages WHERE member_id = " . $_SESSION["member_id"] . " AND page_key='$page_key'";
@@ -129,7 +132,7 @@ class Member extends Member_Controller {
             $data['title'] = trim($this->input->post('title'));
             $data['member_id'] = $_SESSION["member_id"];
             $data['session'] = $_SESSION["sessionid"];
-
+            $data['page_id'] = trim($this->input->post('page_id'));
 
 
             if ($data['description'] != '' && $data['title'] != '') {
@@ -151,8 +154,15 @@ class Member extends Member_Controller {
             $data['detail'] = trim($this->input->post('detail'));
             $data['member_id'] = $_SESSION["member_id"];
             $data['session'] = $_SESSION["sessionid"];
+            $data['sessionid'] = $_SESSION["sessionid"];
+            $data['item_type'] = 'NOTECARD';
+            $data['page_id'] = trim($this->input->post('page_id'));
 
-
+//define('COREGRADE_ACCOUNT_ADDPAGECARD', 11029);
+            if ($data['detail'] != '' && $data['title'] != '') {
+                $out = [];
+                $this->coregrade_webapi(COREGRADE_ACCOUNT_ADDPAGECARD, $data, $out);
+            }
 
 
             //    exit();
diff --git a/www/application/views/member/addpages/NOTECARD.php b/www/application/views/member/addpages/NOTECARD.php
index c85a714..4de50b1 100644
--- a/www/application/views/member/addpages/NOTECARD.php
+++ b/www/application/views/member/addpages/NOTECARD.php
@@ -6,16 +6,18 @@
         <div class="card-body">
             <form class="form">
                 <input type="hidden" id='member_id' name='member_id' value="<?= $_SESSION["member_id"] ?>" />
+                <input type="hidden" id='page_id' name='page_id' value="<?= $page_id ?>" />
+
                 <div class="form-body">
                     <div class="form-group">
                         <label for="feedback1" class="sr-only">Note Title</label>
-                        <input type="text" id="feedback1" class="form-control" placeholder="Title" name="title" value="<?= isset($title) ? $title : '' ?>">
+                        <input type="text" id="feedback1" class="form-control" placeholder="Title" name="title" value="<?= isset($title) ? $title : '' ?>" required>
                     </div>
 
 
                     <div class="form-group">
                         <label for="feedback3" class="sr-only">Note Detail</label>
-                        <textarea id="feedback3" rows="6" class="form-control" name="detail" placeholder="Note Detail"><?= isset($details) ? $details : '' ?></textarea>
+                        <textarea id="feedback3" rows="6" class="form-control" name="detail" placeholder="Note Detail" required=""><?= isset($details) ? $details : '' ?></textarea>
                     </div>
                 </div>
 
@@ -41,9 +43,10 @@
         var post_data = {
             'member_id': form.member_id.value,
             'title': form.title.value,
-            'detail': form.detail.value
+            'detail': form.detail.value,
+            'page_id': form.page_id.value
         };
-        alert(1);
+        // alert(1);
         // Get some values from elements on the page:
         var url = "/member/addNotecard";
         // Send the data using post
diff --git a/www/application/views/member/pages/manage_contents.php b/www/application/views/member/pages/manage_contents.php
index 076328c..b9c0906 100644
--- a/www/application/views/member/pages/manage_contents.php
+++ b/www/application/views/member/pages/manage_contents.php
@@ -3,6 +3,8 @@
     <div class="col-xl-2 col-md-6 col-sm-12">
 
         <div class="card">
+          <input type="hidden" id='member_id' name='page_id' value="<?=$page_id?>" />
+
             <div class="card-content">
                 <div class="card-body">
                     <h4 class="card-title">Add Contents to <?= $title ?> </h4>
@@ -16,7 +18,7 @@
                         ?>
                        <li class="list-group-item">
                         <span class="badge badge-pill <?=$mitm[2]?> float-right">0</span>
-                        <a href="#"  onclick="viewCardAddAction('<?=$mitm[0]?>',<?=$_SESSION['member_id']?>);"><?=$mitm[1]?></a>
+                        <a href="#"  onclick="viewCardAddAction('<?=$mitm[0]?>',<?=$_SESSION['member_id']?>,<?=$page_id?>);"><?=$mitm[1]?></a>
                     </li>
                     
                         <?php
@@ -60,17 +62,17 @@
 
  
 
-    function viewCardAddAction(action_name, member_id) {
+    function viewCardAddAction(action_name, member_id,page_id) {
         //alert(action_name);
-        return viewCardAddActionOffset(action_name, member_id, 50, 0);
+        return viewCardAddActionOffset(action_name, member_id,page_id, 50, 0);
     }
 
-    function viewCardAddActionOffset(action_name, member_id, limit, offset) {
+    function viewCardAddActionOffset(action_name, member_id,page_id, limit, offset) {
 
         $('#addcard_detail').html('Processing...');
         $('#acc' + member_id).prop('disabled', true);
         $.ajax({
-            url: "/member/viewCardAddAction?proc=PROCESS&action_name="+action_name+"&member_id=" + member_id + "&limit=" + limit + "&offset=" + offset
+            url: "/member/viewCardAddAction?proc=PROCESS&action_name="+action_name+"&member_id=" + member_id + "&page_id=" + page_id + "&offset=" + offset
         }).done(function (data) {
             $('#addcard_detail').html(data);
             $('#acc' + member_id).prop('disabled', false);
diff --git a/www/application/views/member/pages/pages_OTHER.php b/www/application/views/member/pages/pages_OTHER.php
index 9d6376d..b21c941 100644
--- a/www/application/views/member/pages/pages_OTHER.php
+++ b/www/application/views/member/pages/pages_OTHER.php
@@ -1,11 +1,24 @@
+ <div class="row">
+
+   
+<?php
+foreach ($page_card_items AS $drow) {
+    // print_r($drow);
+    ?> 
+     <div class="col-lg-3 col-md-6 col-12">
+           <div class="card">
+                <div class="card-header d-flex flex-column align-items-start pb-0" style="background-color: aliceblue;">
+                    <h3 class="text-bold-700 mt-1 mb-25"><?= $drow->title ?></h3>
+                </div>
+                <div class="card-content" style="height: 180px; padding:20px;background-color: #ccffff;">
+                    <?= $drow->detail ?>
+                </div> 
+           </div>
+     </div>
 
 
+    <?php
+}
+?>
 
-<div class="row">
-    
-    
-    
-
-    
-    
 </div>
\ No newline at end of file