mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 00:24:35 +00:00
- Merged controller system/infocenter/InfoCenter.php into system/infocenter/InfocenterDetails.php
- Removed controller application/controllers/system/infocenter/InfocenterDetails.php - Removed method _getFilterList from controller system/infocenter/InfoCenter.php - Added method _setNavigationMenuArray to controller system/infocenter/InfoCenter.php to generate the array for the left menu - Added public method getFilterList to model Filters_model - Removed view application/views/widgets/navigation.php - Removed widget application/widgets/navigation.php - Widget application/widgets/FHC_navigation.php now is usable to print any menu from an array
This commit is contained in:
Paolo
@@ -1,56 +1,59 @@
|
||||
<?php
|
||||
$this->load->view('templates/FHC-Header', array('title' => 'Info Center', 'jquery3' => true, 'bootstrap' => true, 'fontawesome' => true, 'sbadmintemplate' => true, 'tablesorter' => false, 'customCSSs' => 'vendor/FHC-vendor/jquery-tableso
|
||||
rter/css/theme.default.css', 'customJSs' => array('vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js', 'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js')));
|
||||
$this->load->view(
|
||||
'templates/FHC-Header',
|
||||
array(
|
||||
'title' => 'Info Center',
|
||||
'jquery3' => true,
|
||||
'bootstrap' => true,
|
||||
'fontawesome' => true,
|
||||
'sbadmintemplate' => true,
|
||||
'tablesorter' => false,
|
||||
'customCSSs' => 'vendor/FHC-vendor/jquery-tablesorter/css/theme.default.css',
|
||||
'customJSs' => array(
|
||||
'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.js',
|
||||
'vendor/FHC-vendor/jquery-tablesorter/js/jquery.tablesorter.widgets.js'
|
||||
)
|
||||
)
|
||||
);
|
||||
?>
|
||||
|
||||
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
|
||||
<?php
|
||||
<div id="wrapper">
|
||||
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
|
||||
<?php
|
||||
|
||||
echo $this->widgetlib->widget(
|
||||
'FHC_navheader'
|
||||
);
|
||||
echo $this->widgetlib->widget(
|
||||
'FHC_navheader'
|
||||
);
|
||||
|
||||
echo $this->widgetlib->widget(
|
||||
'FHC_navigation'
|
||||
);
|
||||
?>
|
||||
</nav>
|
||||
<div id="page-wrapper">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h3 class="page-header">Infocenter Übersicht</h3>
|
||||
echo $this->widgetlib->widget(
|
||||
'FHC_navigation',
|
||||
$navigationMenuArray
|
||||
);
|
||||
?>
|
||||
</nav>
|
||||
<div id="page-wrapper">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h3 class="page-header">Infocenter Übersicht</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<?php
|
||||
$this->load->view('system/infocenter/infocenterData.php');
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <span>
|
||||
<?php
|
||||
/* $this->load->view(
|
||||
'system/infocenter/infocenterFilters.php',
|
||||
array(
|
||||
'listFiltersSent' => $listFiltersSent,
|
||||
'listFiltersNotSent' => $listFiltersNotSent
|
||||
)
|
||||
);
|
||||
*/ ?>
|
||||
</span>-->
|
||||
|
||||
<span>
|
||||
<?php
|
||||
$this->load->view('system/infocenter/infocenterData.php');
|
||||
?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
//javascript hacks for bootstrap
|
||||
$("select").addClass("form-control");
|
||||
$("input[type=text]").addClass("form-control");
|
||||
$("input[type=button]").addClass("btn btn-default");
|
||||
$("#tableDataset").addClass('table table-bordered table-responsive table-condensed');
|
||||
</script>
|
||||
<script>
|
||||
//javascript hacks for bootstrap
|
||||
$("select").addClass("form-control");
|
||||
$("input[type=text]").addClass("form-control");
|
||||
$("input[type=button]").addClass("btn btn-default");
|
||||
$("#tableDataset").addClass('table table-bordered table-responsive table-condensed');
|
||||
</script>
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
AND pss.bestaetigtam IS NULL
|
||||
AND pss.bestaetigtvon IS NULL
|
||||
AND ps.person_id = p.person_id
|
||||
AND tbl_studiengang.typ in(\'b\',\'m\')
|
||||
AND tbl_studiengang.typ in(\'b\', \'m\')
|
||||
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
|
||||
LIMIT 1
|
||||
) AS "Studiensemester",
|
||||
@@ -47,7 +47,7 @@
|
||||
AND pss.bestaetigtam IS NULL
|
||||
AND pss.bestaetigtvon IS NULL
|
||||
AND ps.person_id = p.person_id
|
||||
AND tbl_studiengang.typ in(\'b\',\'m\')
|
||||
AND tbl_studiengang.typ in(\'b\', \'m\')
|
||||
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
|
||||
LIMIT 1
|
||||
) AS "SendDate"
|
||||
@@ -60,7 +60,7 @@
|
||||
JOIN public.tbl_studiengang USING(studiengang_kz)
|
||||
WHERE
|
||||
person_id=p.person_id
|
||||
AND tbl_studiengang.typ in(\'b\',\'m\')
|
||||
AND tbl_studiengang.typ in(\'b\', \'m\')
|
||||
AND \'Interessent\' = (SELECT status_kurzbz FROM public.tbl_prestudentstatus
|
||||
WHERE prestudent_id=tbl_prestudent.prestudent_id
|
||||
ORDER BY datum DESC, insertamum DESC, ext_id DESC
|
||||
@@ -72,8 +72,8 @@
|
||||
FROM
|
||||
public.tbl_prestudentstatus
|
||||
WHERE
|
||||
prestudent_id=tbl_prestudent.prestudent_id
|
||||
AND status_kurzbz=\'Interessent\'
|
||||
prestudent_id = tbl_prestudent.prestudent_id
|
||||
AND status_kurzbz = \'Interessent\'
|
||||
AND bestaetigtam IS NULL
|
||||
AND bestaetigtvon IS NULL
|
||||
AND studiensemester_kurzbz IN (
|
||||
@@ -96,7 +96,7 @@
|
||||
|
||||
$datasetRaw->{$fieldName} = sprintf(
|
||||
$link,
|
||||
base_url('index.ci.php/system/infocenter/infocenterDetails/showDetails/'),
|
||||
base_url('index.ci.php/system/infocenter/InfoCenter/showDetails/'),
|
||||
$datasetRaw->PersonId
|
||||
);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,8 @@ $this->load->view('templates/FHC-Header', array('title' => 'InfocenterDetails',
|
||||
);
|
||||
|
||||
echo $this->widgetlib->widget(
|
||||
'FHC_navigation'
|
||||
'FHC_navigation',
|
||||
$navigationMenuArray
|
||||
);
|
||||
?>
|
||||
</nav>
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
<?php
|
||||
function _printLists($listFilters)
|
||||
{
|
||||
foreach ($listFilters as $filterId => $description)
|
||||
{
|
||||
$toPrint = '<div><a href="%s=%s">%s</a></div>';
|
||||
|
||||
echo sprintf($toPrint, base_url('index.ci.php/system/infocenter/InfoCenter?filterId'), $filterId, $description).PHP_EOL;
|
||||
}
|
||||
}
|
||||
|
||||
// HTML
|
||||
// body
|
||||
// span
|
||||
?>
|
||||
<div>
|
||||
|
||||
<div>
|
||||
Abgeschickt:
|
||||
</div>
|
||||
|
||||
<?php _printLists($listFiltersSent); ?>
|
||||
|
||||
<div>
|
||||
Nicht abgeschickt:
|
||||
</div>
|
||||
|
||||
<?php _printLists($listFiltersNotSent); ?>
|
||||
|
||||
</div>
|
||||
@@ -1,44 +1,9 @@
|
||||
<div class="navbar-default sidebar" role="navigation">
|
||||
<div class="sidebar-nav navbar-collapse">
|
||||
<ul class="nav" id="side-menu">
|
||||
<!-- <li class="sidebar-search">
|
||||
<div class="input-group custom-search-form">
|
||||
<input type="text" class="form-control" placeholder="Search...">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" type="button">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
</span>
|
||||
</div> -->
|
||||
<!-- /input-group -->
|
||||
<!-- </li>-->
|
||||
<?php
|
||||
foreach ($items as $item)
|
||||
printNavItem($item); ?>
|
||||
FHC_navigation::printNavigationMenu();
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.sidebar-collapse -->
|
||||
</div>
|
||||
<!-- /.navbar-static-side -->
|
||||
<?php
|
||||
function printNavItem($item, $depth = 1)
|
||||
{
|
||||
$expanded = isset($item['expand']) && $item['expand'] === true ? ' active' : '';
|
||||
echo '<li class="'.$expanded.'">
|
||||
<a href="'.$item['link'].'"'.$expanded.'>'.(isset($item['icon']) ? '<i class="fa fa-'.$item['icon'].' fa-fw"></i> ' : '').$item['description'].(!empty($item['children']) ? '<span class="fa arrow"></span>':'').'</a>';
|
||||
if (!empty($item['children']))
|
||||
{
|
||||
$level = '';
|
||||
if ($depth === 1)
|
||||
$level = 'second';
|
||||
elseif ($depth > 1)
|
||||
$level = 'third';
|
||||
|
||||
echo '<ul class="nav nav-'.$level.'-level" '.$expanded.'>';
|
||||
foreach ($item['children'] as $child)
|
||||
printNavItem($child, ++$depth);
|
||||
echo '</ul>';
|
||||
}
|
||||
echo '</li>';
|
||||
}
|
||||
?>
|
||||
@@ -1,12 +0,0 @@
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<a class="brand" href="#"><?php echo $title; ?></a>
|
||||
<ul class="nav">
|
||||
<?php foreach($items as $item): ?>
|
||||
<li><a href="#<?php echo $item; ?>"><?php echo $item; ?></a></li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user