7 Commits

Author SHA1 Message Date
srssaulo
fba3c52ada Ajustando a listagem de curso para mostrar imagens. Funcionando para admin e usuários comuns. 2019-10-23 14:35:31 -03:00
eduardogusmao
2d953fdd29 feat/#12 - Listagem de cursos na dashboard 2019-10-22 14:54:19 -03:00
Eduardo Gusmão
b953febe54 Merge branch 'style/#10' into 'master'
style/#10 - Configurando icones sociais no rodape com painel adminsitrativo do tema

See merge request AVAS/qualisaude/theme_qualisaude!3
2019-10-01 17:24:10 -03:00
eduardogusmao
6c271ff43f style/#10 - Configurando icones sociais no rodape com painel adminsitrativo do tema 2019-10-01 17:29:44 -03:00
Eduardo Gusmão
6c74dc8755 Merge branch 'fix/#9' into 'master'
Consertando o titulo quebrado na pagina do curso

See merge request AVAS/qualisaude/theme_qualisaude!2
2019-09-24 14:47:06 -03:00
eduardogusmao
91c3953ccf Consertando o titulo quebrado na pagina do curso 2019-09-24 14:52:35 -03:00
Saulo Rufino de Sá
b8d4c7debb Merge branch 'feat/leftblok_hide' into 'master'
escondendo o bloco esquerdo apenas para alunos e abrindo apenas para Admin

See merge request AVAS/qualisaude/theme_qualisaude!1
2019-09-24 14:07:40 -03:00
6 changed files with 318 additions and 15 deletions

View File

@@ -54,9 +54,9 @@ $string['footnote'] = 'Footnote';
$string['footnotedefault'] = '<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and tronic typesetting, sheets taining Lorem Ipsum passages.<br><a href="#">Read More &raquo;</a></p>';
$string['footnotedesc'] = 'Whatever you add to this textarea will be displayed in the footer throughout your Moodle site.';
$string['frontpageheading'] = 'Front page';
$string['gpurl'] = 'Google+';
$string['gpurl_default'] = 'https://www.google.com/+yourgoogleplusid';
$string['gpurldesc'] = 'The Google+ url of your organisation.';
$string['gpurl'] = 'Instagram';
$string['gpurl_default'] = 'https://www.instagram.com/';
$string['gpurldesc'] = 'The Instagram url of your organisation.';
$string['headerheading'] = 'General';
$string['homebanner'] = 'Home Page Banner';
$string['homebanner_slogan'] = 'We have the largest collection of courses';
@@ -111,9 +111,9 @@ $string['numberofslides_desc'] = 'Number of slides on the slider.';
$string['numberoftmonials'] = 'Number of Testimonials';
$string['numberoftmonials_desc'] = 'Number of Testimonials on the Home Page.';
$string['phoneno'] = 'Phone No';
$string['pinurl'] = 'Pinterest';
$string['pinurl_default'] = 'https://in.pinterest.com/yourpinterestname/';
$string['pinurldesc'] = 'The Pinterest url of your organisation.';
$string['pinurl'] = 'Youtube';
$string['pinurl_default'] = 'https://www.youtube.com/';
$string['pinurldesc'] = 'The Youtube url of your organisation.';
$string['pluginname'] = 'qualisaude';
$string['readmore'] = 'Read More';
$string['region-side-post'] = 'Right';

View File

@@ -24,6 +24,8 @@
defined('MOODLE_INTERNAL') || die();
use core_completion\progress;
user_preference_allow_ajax_update('drawer-open-nav', PARAM_ALPHA);
require_once($CFG->libdir . '/behat/lib.php');
@@ -85,6 +87,7 @@ $scontactus = get_string('contact_us', 'theme_qualisaude');
$phone = get_string('phone', 'theme_qualisaude');
$email = get_string('email', 'theme_qualisaude');
$sfollowus = get_string('followus', 'theme_qualisaude');
$myCourses = getMyCourses();
$url = ($fburl != '' || $pinurl != '' || $twurl != '' || $gpurl != '') ? 1 : 0;
$block3 = ($address != '' || $phoneno != '' || $emailid != '' || $url != 0) ? 1 : 0;
@@ -156,9 +159,150 @@ $templatecontext = [
"block1" => $block1,
"footlogourl" => $footlogourl,
"username" => $username,
"show_btn_leftblock"=>$show_btn_leftblock
"show_btn_leftblock"=>$show_btn_leftblock,
"myCourses"=>$myCourses
];
$templatecontext['flatnavigation'] = $PAGE->flatnav;
echo $OUTPUT->render_from_template('theme_qualisaude/my', $templatecontext);
function getMyCourses(){
global $DB, $CFG, $OUTPUT;
$content = "";
// Carregamento para usuário que não são administrador
//------------- ---------------
//SET COURSE LIST MANDACARU
//------------- ---------------
$courses_list = enrol_get_my_courses(NULL,'sortorder DESC', 0, [], true);
$categories = $DB->get_records('course_categories', null, '', 'id, name');
$auxcat = 0;
$filtered_course_list = array();
foreach($courses_list as $courseobj){
if($auxcat ==0){
$change_category = 1;
$auxcat = $courseobj->category;
}elseif($auxcat != $courseobj->category){
$change_category = 1;
$auxcat = $courseobj->category;
}else{
$change_category = 0;
$auxcat = $courseobj->category;
}
$courseobj->categoryname = $categories[$courseobj->category]->name;
$courseobj->imagepath = "";
$courseobj->changecategory = $change_category;
$filtered_course_list[]= $courseobj; // Aplicação do filtro eliminando as disciplinas que não devem ser consideradas
}
//------------- ---------------
//SET COURSE LIST MANDACARU
//------------- ---------------
$content .= '<section id="list-course" class="col-lg-12 col-md-12 col-xs-12">';
$content .= ' <ul class="nav nav-tabs" id="myTabs" role="tablist">';
$cont = 0;
foreach($filtered_course_list as $key=>$cats){
$active = "";
if($key==0){
$active ='active';
}
if($cats->changecategory){
$content .= "<li role=\"presentation\"><a href=\"#{$cats->category}\" class=\"{$active}\" aria-controls=\"categoryname\" role=\"tab\" data-toggle=\"tab\">$cats->categoryname</a></li>";
}
}
if(count($filtered_course_list) == $cont ) {
$content .= "<li role=\"presentation\" class=\"active\"><a href=\"#\" aria-controls=\"categoryname\" role=\"tab\" data-toggle=\"tab\">Nenhuma disciplina disponível</a></li>";
}
$content .= ' </ul>';
$content .= ' <div class="tab-content card-body">';
$continue =0;
foreach($filtered_course_list as $key=>$cats){
$active = "";
if($key ==0){
$active ='active';
}
//close div
if($cats->changecategory && $key!=0){
// $content .= "</ul>\n";
$content .= " </div>\n";
}else{
$active ='active';
}
//open div
if($cats->changecategory){
$content .= "<div role=\"tabpanel\" class=\"tab-pane card-deck dashboard-card-deck fade in {$active}\" id=\"$cats->category\">\n";
// $content .= "<ul class='row'>\n";
}
//gerando a imagem do curso
$courseDetails = $DB->get_record('course', array('id'=>$cats->id));
$courseImage = \core_course\external\course_summary_exporter::get_course_image($courseDetails);
if(!$courseImage){
$courseImage = $OUTPUT->get_generated_image_for_id($cats->id);
}
//calc Progress
$progress =getProgress($courseDetails);
$course_link = $CFG->wwwroot. "/course/view.php?id={$cats->id}";
$content .= "
<div class=\"card dashboard-card\" role=\"listitem\" data-region=\"course-content\" data-course-id=\"2\">
<a href=\"{$course_link}\" tabindex=\"-1\">
<div class=\"card-img dashboard-card-img\" style=\"background-image: url({$courseImage});\">
<span class=\"sr-only\"></span>
</div>
</a>
<div class=\"p-2 course-info-container\" id=\"course-info-container-2-4\">
<div class=\"d-flex align-items-start\">
<div class=\"w-100 text-truncate\">
<a href=\"{$course_link}\" class=\"coursename mr-2\">
<span class=\"sr-only\">Nome do curso</span>
<span class=\"multiline\">{$cats->fullname}</span>
</a>
</div>
</div>
</div>
<div class=\"p-2\">
<div class=\"progress bg-white border\">
<div class=\"progress-bar bar\" role=\"progressbar\" aria-valuenow=\"50\" style=\"width:{$progress}%\" aria-valuemin=\"0\" aria-valuemax=\"100\"></div>
</div>
<div class=\"small\">
<span class=\"sr-only\">Progresso do curso:</span>
<strong>{$progress}</strong>% completo
</div>
</div>
</div>
";
}
$content .= " </div>\n";
$content .= ' </div>';
$content .= '</section>';
return $content;
}
function getProgress($course){
$percentage = progress::get_course_progress_percentage($course);
if(!$percentage){
$percentage=0;
}
return $percentage;
}

View File

@@ -192,6 +192,22 @@ section#inicial{
height: 50px;
}
}
#footer{
.social-media{
padding: 20px 0 0;
ul{
li{
a {
font-size: 36px;
color: #31539E;
&:hover{
color: #009cd1;
}
}
}
}
}
}
}
/* ################################### TOPO ################################# */
@@ -249,7 +265,8 @@ section#inicial{
font-size: 28px;
font-weight: 700;
&.course-title{
margin-top: 30px;
margin-top: 10px;
max-width: 900px;
}
}
}
@@ -260,9 +277,135 @@ section#inicial{
.pagelayout-mydashboard{
#region-main{
border: 0px;
section#list-course{
padding-left: 3px;
#myTabs{
li{
a{
border-radius: 10px 10px 0 0;
border: 1px solid #efefef;
border-bottom: 0px;
padding: 1px 20px 0px 20px;
line-height: 30px;
display: block;
margin-right: 10px;
text-decoration: none;
&.active{
background-color: #dee2e7;
}
}
}
}
.card-body{
padding: 0px;
.card-deck{
.card{
box-shadow: 0px 1px 3px 0px rgba(0,0,0,.1);
margin: 10px 2px 0px 2px;
display: inline-flex;
}
}
}
}
}
}
.dashboard-card-deck:not(.fixed-width-cards) {
@media (min-width: 576px) {
.dashboard-card {
width: calc(50% - #{$card-gutter});
}
}
@media (min-width: 840px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
@media (min-width: 1100px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
@media (min-width: 1360px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
}
#region-main.has-blocks {
.dashboard-card-deck:not(.fixed-width-cards) {
@media (min-width: 1200px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
@media (min-width: 1470px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
}
}
body.drawer-open-left {
.dashboard-card-deck:not(.fixed-width-cards) {
@media (min-width: 768px) {
.dashboard-card {
width: calc(100% - #{$card-gutter});
}
}
@media (min-width: 861px) {
.dashboard-card {
width: calc(50% - #{$card-gutter});
}
}
@media (min-width: 1122px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
@media (min-width: 1381px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
}
}
body.drawer-open-left #region-main.has-blocks {
.dashboard-card-deck:not(.fixed-width-cards) {
@media (min-width: 1200px) {
.dashboard-card {
width: calc(100% - #{$card-gutter});
}
}
@media (min-width: 1236px) {
.dashboard-card {
width: calc(50% - #{$card-gutter});
}
}
@media (min-width: 1497px) {
.dashboard-card {
width: calc(33.33% - #{$card-gutter});
}
}
}
}
@media (min-width: 1200px) {
#block-region-side-pre {
.dashboard-card-deck:not(.fixed-width-cards) {
margin-left: 0;
margin-right: 0;
.dashboard-card {
width: calc(100% - #{$card-gutter}) !important;
}
}
}
}
/* ################################### CURSO ################################# */
.pagelayout-course{

View File

@@ -198,13 +198,6 @@ if (is_siteadmin()) {
$setting = new admin_setting_configtext($name, $title, $description, $default);
$temp->add($setting);
$name = 'theme_qualisaude/twurl';
$title = get_string('twurl', 'theme_qualisaude');
$description = get_string('twurldesc', 'theme_qualisaude');
$default = get_string('twurl_default', 'theme_qualisaude');
$setting = new admin_setting_configtext($name, $title, $description, $default);
$temp->add($setting);
$name = 'theme_qualisaude/gpurl';
$title = get_string('gpurl', 'theme_qualisaude');
$description = get_string('gpurldesc', 'theme_qualisaude');
@@ -212,6 +205,13 @@ if (is_siteadmin()) {
$setting = new admin_setting_configtext($name, $title, $description, $default);
$temp->add($setting);
// $name = 'theme_qualisaude/twurl';
// $title = get_string('twurl', 'theme_qualisaude');
// $description = get_string('twurldesc', 'theme_qualisaude');
// $default = get_string('twurl_default', 'theme_qualisaude');
// $setting = new admin_setting_configtext($name, $title, $description, $default);
// $temp->add($setting);
$settings->add($temp);
/* Footer Settings end */
}

View File

@@ -35,6 +35,21 @@
<!-- {{{footnote}}}-->
</div>
</div>
<div class="col-lg-4">
<div class="social-media pull-right">
<ul>
{{# fburl}}
<li class="smedia-01"><a target="_blank" href="{{fburl}}"><i class="fa fa-facebook-official"></i></a></li>
{{/ fburl}}
{{# pinurl}}
<li class="smedia-02"><a target="_blank" href="{{pinurl}}"><i class="fa fa-youtube"></i></a></li>
{{/ pinurl}}
{{# gpurl}}
<li class="smedia-03"><a target="_blank" href="{{gpurl}}"><i class="fa fa-instagram"></i></a></li>
{{/ gpurl}}
</ul>
</div>
</div>
<div class="col-md-12">
<hr style="border-top:1px solid #4565a5;" />
</div>

View File

@@ -82,6 +82,7 @@
<div class="region_main_settings_menu_proxy"></div>
{{/hasregionmainsettingsmenu}}
{{{ output.course_content_header }}}
{{{ myCourses }}}
{{{ output.main_content }}}
{{{ output.activity_navigation }}}
{{{ output.course_content_footer }}}