Skip to content

Commit

Permalink
Show class activity, and send chat by channel
Browse files Browse the repository at this point in the history 
class activity (create channel)
  • Loading branch information
@FlazeFy
FlazeFy committed Jul 16, 2022
1 parent 1f94abc commit 6be539c
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 31 deletions.
13 changes: 7 additions & 6 deletions Learnzia/application/controllers/classCtrl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public function index(){
$data['listChannel']= $this->classModel->get_list_channel();
$data['listClass']= $this->classModel->get_list_class();
$data['listRel']= $this->classModel->get_list_relation();
$data['listActivity']= $this->classModel->get_list_activity();
$data['dataClassForumMsg']= $this->classModel->get_all_classForumMessage();
$this->load->view('classView', $data);
}
Expand All @@ -37,7 +38,7 @@ public function selectChannel()
{
$id = $this->input->post('id_channel');

$this->session->set_userdata('set_id_channel',$id);
$this->session->set_userdata('channelTrack',$id);
redirect('classCtrl');
}

Expand Down Expand Up @@ -121,13 +122,13 @@ public function createChannel(){
}
}

//Send chat in main channel
//Send chat in channel
public function sendMainChat(){
if($this->input->post('imageSwitchMain') == 'on'){
$date = date("Ymdhis");
$username = $this->session->userdata('userTrack');
$classname = $this->session->userdata('classTrack');
$channel = $this->input->post('channel');
$channel = $this->session->userdata('channelTrack');
$imageURL = $username. '' .$classname. '' .$channel. '' .$date;
} else {
$imageURL = 'null';
Expand All @@ -141,10 +142,10 @@ public function sendMainChat(){
));
$data = array(
'id_message' => 'NULL',
'sender' => $this->session->userdata('userTrack'),
'id_user' => $this->session->userdata('userIdTrack'),
'text' => $this->input->post('messagetext'),
'classname' => $this->session->userdata('classTrack'),
'channel' => $this->input->post('channel'),
'id_classroom' => $this->session->userdata('classIdTrack'),
'id_channel' => $this->session->userdata('channelTrack'),
'imageURL' => $imageURL,
'datetime' => date("Y/m/d h:i:sa")
);
Expand Down
1 change: 1 addition & 0 deletions Learnzia/application/controllers/globalCtrl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ public function openClass(){

$this->session->set_userdata('classTrack', $this->input->post('visitClass'));
$this->session->set_userdata('classIdTrack', $id);
$this->session->set_userdata('channelTrack', 0);
redirect("classCtrl");
}

Expand Down
18 changes: 16 additions & 2 deletions Learnzia/application/models/classModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ public function get_list_channel()
$this->db->order_by('datetime','ASC');
return $data = $this->db->get()->result_array();
}
public function get_list_activity()
{
$this->db->select('*');
$this->db->from('classroom-activity');
$this->db->join('user','user.id_user = classroom-activity.id_user');
$this->db->where('id_classroom', $this->session->userdata("classIdTrack"));
$this->db->order_by('datetime','ASC');
return $data = $this->db->get()->result_array();
}
//For searching
public function get_list_user(){
$data = $this->db->get('user');
Expand All @@ -55,8 +64,13 @@ public function get_list_relation()
}
public function get_all_classForumMessage()
{
$data = $this->db->get('classforummessage');
return $data->result_array();
$this->db->select('*');
$this->db->from('classforummessage');
$this->db->join('user','user.id_user = classforummessage.id_user');
$this->db->where('id_classroom', $this->session->userdata("classIdTrack"));
$this->db->where('id_channel', $this->session->userdata("channelTrack"));
$this->db->order_by('datetime','ASC');
return $data = $this->db->get()->result_array();
}
public function posting($data){
$this->db->insert('message',$data);
Expand Down
71 changes: 48 additions & 23 deletions Learnzia/application/views/classView.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
?>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-content" style='min-height:550px;'>
<div class="tab-pane active" id="forum" role="tabpanel">
<div class="row">
<div class="col-2">
Expand All @@ -183,7 +183,7 @@
</div>
<div class="container-fluid m-0">
<form action='classCtrl/selectChannel' method='POST'>
<input name='id_channel' value='0' hidden></input>
<input name='id_channel' value='main' hidden></input>
<button class="nav-link active w-100" type="submit">#Main</button>
</form>
</div>
Expand All @@ -192,7 +192,7 @@
echo"
<div class='container-fluid m-0'>
<form action='classCtrl/selectChannel' method='POST'>
<input name='id_channel' value='0' hidden></input>
<input name='id_channel' value='".$channel['id_channel']."' hidden></input>
<button class='nav-link active w-100' type='submit'>#".$channel['channel_name']."</button>
</form>
</div>";
Expand All @@ -208,7 +208,7 @@
<div class="tab-content" >
<!-- Manage Channel -->
<?php
if($this->session->userdata('set_id_channel') == "manage"){
if($this->session->userdata('channelTrack') == "manage"){
echo"
<div class='tab-pane active'>
<div class='container-fluid p-2'>";
Expand Down Expand Up @@ -265,13 +265,12 @@
echo"
</div>
</div>";
} else if($this->session->userdata('set_id_channel') == 0){
} else {
echo"
<!-- Main Channel -->
<div class='tab-pane active'>
<div class='imessage' style='max-height: 480px; max-width:auto; overflow-y: auto; height:800px;' id='chat-box'>";
foreach($dataClassForumMsg as $chat){
if (($chat['sender'] != $this->session->userdata('userTrack'))&&($chat['classname']==$this->session->userdata('classTrack'))&&($chat['channel']== 'main')){
if ($chat['id_user'] != $this->session->userdata('userIdTrack')){
echo"<p class='from-them'>";
if($chat['imageURL'] != 'null'){
echo"<img src='http://localhost/Learnzia/assets/uploads/channel/main_".$chat['imageURL'].".jpg' alt='Card image cap' style='width:200px; height:200px;
Expand All @@ -280,7 +279,7 @@
echo"<img id='icon' src='http://localhost/Learnzia/assets/uploads/user_".$chat['sender'].".jpg' alt='Card image cap' class='rounded-circle img-fluid' style='width:45px; height:45px; float:left;
margin-right:2%'>".$chat['text']."<br><a style='color:#e69627; font-size:13.5px; font-style:italic;'>~ ".$chat['sender']." on ".$chat['datetime']."</a>
</p>";
} else if(($chat['sender'] == $this->session->userdata('userTrack'))&&($chat['classname']==$this->session->userdata('classTrack'))&&($chat['channel']== 'main')){
} else if($chat['id_user'] == $this->session->userdata('userIdTrack')){
echo"<p class='from-me'>";
if($chat['imageURL'] != 'null'){
echo"<img src='http://localhost/Learnzia/assets/uploads/channel/main_".$chat['imageURL'].".jpg' alt='Card image cap' style='width:200px; height:200px;
Expand All @@ -294,7 +293,6 @@
</div>
<div class='container' style='min-width:110%; margin-bottom:2%;'>
<form method='post' action='classCtrl/sendMainChat' class='form-inline' enctype='multipart/form-data'>
<input type='text' class='form-control' name='channel' value='main' hidden>
<div class='container'>
<label class='switch' style='float:left; margin-right:1%;'>
<input type='checkbox' name='imageSwitchMain'>
Expand All @@ -321,9 +319,7 @@
</form>
</div>
</div><!--End of channel-->";
} else {

}
}
?>


Expand All @@ -335,24 +331,53 @@

<div class="tab-pane" id="activity" role="tabpanel" style='overflow-y: initial;'>
<div class="container" style='max-height: calc(160vh - 120px); overflow-y: auto;'>
<h4>test activity</h4>
<h4 class="m-2">Activity</h4>
<?php
foreach($listActivity as $activity){
echo"
<div class='card-header rounded mb-2' style='background:#313436; height:80px;'>
<img id='icon' src='http://localhost/Learnzia/assets/uploads/user_".$activity['username'].".jpg' alt='Card image cap' class='rounded-circle img-fluid'
style='width:50px; height:50px; float:left; margin-right:2%;'>";
if ($activity['username'] == $this->session->userdata('userTrack')){
echo"
<h5 style='font-size:15.5px; color:#F1C40F;'>You</h5>";
} else {
echo"
<h5 style='font-size:15.5px; color:#F1C40F;'>".$activity['username']."</h5>";
}
echo $activity['context']." <span class='text-secondary font-italic text-small' style='font-size:12px;'> ~ ".$activity['datetime']."</span>
</div>";
}
?>
</div>
</div>

<div class="tab-pane" id="member" role="tabpanel" style='overflow-y: initial;'>
<div class="container" style='max-height: calc(160vh - 120px); overflow-y: auto; margin-top:1%;'>
<?php foreach ($listRel as $member){
if($member['classname'] == $this->session->userdata('classTrack')){
echo"<div class='card-header' style='background:#313436; border-radius:6px; margin-bottom:6px;'>
<img id='icon' src='http://localhost/Learnzia/assets/uploads/user_".$member['username'].".jpg' alt='Card image cap' class='rounded-circle img-fluid'
style='width:50px; height:50px; float:left; margin-right:2%; margin-top:6px'>";
<?php
foreach ($listRel as $member){
if($member['classname'] == $this->session->userdata('classTrack')){
echo"
<div class='card-header' style='background:#313436; border-radius:6px; margin-bottom:6px;'>
<img id='icon' src='http://localhost/Learnzia/assets/uploads/user_".$member['username'].".jpg' alt='Card image cap' class='rounded-circle img-fluid'
style='width:50px; height:50px; float:left; margin-right:2%; margin-top:6px'>";
if ($member['username'] == $this->session->userdata('userTrack')){
echo "<h5 style='font-size:15.5px; color:#F1C40F;'>You</h5>";
echo"
<h5 style='font-size:15.5px; color:#F1C40F;'>You</h5>";
} else {
echo "<h5 style='font-size:15.5px; color:#F1C40F;'>".$member['username']."</h5>";}
if($member['typeRelation'] == 'founder'){echo"<p style='font-size:14px; color:#7289da; font-weight:bold;'>".$member['typeRelation']."</p>";}
else if($member['typeRelation'] == 'co-founder') {echo"<p style='font-size:14px; color:#00a13e;'>".$member['typeRelation']."</p>";}
else{echo"<p style='font-size:14px; color:whitesmoke;'>".$member['typeRelation']."</p>";}
echo"
<h5 style='font-size:15.5px; color:#F1C40F;'>".$member['username']."</h5>";
}
if($member['typeRelation'] == 'founder'){
echo"<p style='font-size:14px; color:#7289da; font-weight:bold;'>".$member['typeRelation']."</p>";
}
else if($member['typeRelation'] == 'co-founder') {
echo"
<p style='font-size:14px; color:#00a13e;'>".$member['typeRelation']."</p>";
}
else {
echo"<p style='font-size:14px; color:whitesmoke;'>".$member['typeRelation']."</p>";
}
echo"<button class='btn btn-success' type='submit' style='border:none; float:right; margin-right:2%; margin-top:-50px;'>View Profile</button>";
//Manage member
foreach($listRel as $search){
Expand Down

0 comments on commit 6be539c

Please sign in to comment.