@@ -331,8 +362,7 @@
Interessentenstatus bestätigt und
deren
Zgvdaten
können im
- Infocenter nicht mehr bearbeitet oder
- freigegeben
+ Infocenter nicht mehr bearbeitet
werden.
Alle nicht gespeicherten Zgvdaten gehen
verloren.
diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php
index 2b15cc12d..3f9ed5254 100644
--- a/application/views/system/messageWrite.php
+++ b/application/views/system/messageWrite.php
@@ -8,8 +8,8 @@ $this->load->view(
'fontawesome' => true,
'tinymce' => true,
'sbadmintemplate' => true,
- 'customCSSs' => 'skin/admintemplate_contentonly.css',
- 'customJSs' => 'include/js/bootstrapper.js'
+ 'customCSSs' => 'public/css/sbadmin2/admintemplate_contentonly.css',
+ 'customJSs' => 'public/js/bootstrapper.js'
)
);
?>
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index d368cc6e1..5fbff4953 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -119,7 +119,8 @@
url: "",
method: "POST",
data: {
- filter_id: $(this).attr('value')
+ filter_id: $(this).attr('value'),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
index f6b7dc529..ce2d454ca 100644
--- a/application/views/widgets/filter/saveFilter.php
+++ b/application/views/widgets/filter/saveFilter.php
@@ -9,7 +9,8 @@
url: "",
method: "POST",
data: {
- customFilterDescription: $("#customFilterDescription").val()
+ customFilterDescription: $("#customFilterDescription").val(),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 7613639ff..a011e5555 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -77,7 +77,8 @@
url: "",
method: "POST",
data: {
- selectedFieldsLst: arrayDndId
+ selectedFieldsLst: arrayDndId,
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -109,7 +110,8 @@
url: "",
method: "POST",
data: {
- fieldName: $(this).val()
+ fieldName: $(this).val(),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -131,7 +133,8 @@
url: "",
method: "POST",
data: {
- fieldName: $(this).attr('fieldToRemove')
+ fieldName: $(this).attr('fieldToRemove'),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -153,7 +156,9 @@
$.ajax({
url: "",
method: "GET",
- data: {},
+ data: {
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
+ },
dataType: "json"
})
.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index bca975b13..cf5443069 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -13,7 +13,8 @@
url: "",
method: "POST",
data: {
- fieldName: $(this).val()
+ fieldName: $(this).val(),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -76,7 +77,8 @@
filterNames: selectFilterName,
filterOperations: selectFilterOperation,
filterOperationValues: selectFilterOperationValue,
- filterOptions: selectFilterOption
+ filterOptions: selectFilterOption,
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -100,7 +102,8 @@
url: "",
method: "POST",
data: {
- fieldName: $(this).attr('filterToRemove')
+ fieldName: $(this).attr('filterToRemove'),
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
}
})
.done(function(data, textStatus, jqXHR) {
@@ -199,7 +202,9 @@
$.ajax({
url: "",
method: "GET",
- data: {},
+ data: {
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
+ },
dataType: "json"
})
.done(function(data, textStatus, jqXHR) {
diff --git a/application/views/widgets/filter/tableDataset.php b/application/views/widgets/filter/tableDataset.php
index f0a3efa27..1a19876f4 100644
--- a/application/views/widgets/filter/tableDataset.php
+++ b/application/views/widgets/filter/tableDataset.php
@@ -21,7 +21,9 @@
$.ajax({
url: "",
method: "GET",
- data: {},
+ data: {
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
+ },
dataType: "json"
})
.done(function(data, textStatus, jqXHR) {
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index 925126a43..1e18b594a 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -29,7 +29,7 @@ class FilterWidget extends Widget
const WIDGET_URL_SELECT_FILTERS = 'widgets/filter/selectFilters';
const WIDGET_URL_SAVE_FILTER = 'widgets/filter/saveFilter';
- const SESSION_NAME = 'FILTER';
+ const SESSION_NAME = 'FHC_FILTER_WIDGET';
const ALL_SELECTED_FIELDS = 'allSelectedFields';
const ALL_COLUMNS_ALIASES = 'allColumnsAliases';
@@ -109,7 +109,7 @@ class FilterWidget extends Widget
public function display($widgetData)
{
//
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
//
if ($this->filterId == null && isset($filterSessionArray[self::FILTER_ID]))
@@ -144,7 +144,7 @@ class FilterWidget extends Widget
//
$selectedFields = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::SELECTED_FIELDS]))
{
$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
@@ -195,6 +195,7 @@ class FilterWidget extends Widget
$tmpDataset[] = $formattedResult;
}
}
+
$filterSessionArray[self::DATASET_PARAMETER] = $tmpDataset;
/* ------------------------------------------------------------ */
@@ -204,7 +205,7 @@ class FilterWidget extends Widget
$filterSessionArray[self::METADATA_PARAMETER] = $this->metaData;
- $this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+ $this->_writeSession($filterSessionArray);
//
$this->loadViewFilters();
@@ -422,9 +423,11 @@ class FilterWidget extends Widget
{
$filterSessionArray = array();
- if (isset($_SESSION[self::SESSION_NAME]))
+ $session = $this->_readSession();
+
+ if (count($session) > 0)
{
- $filterSessionArray = $_SESSION[self::SESSION_NAME];
+ $filterSessionArray = $session;
}
if (!isset($filterSessionArray[self::SELECTED_FIELDS]))
@@ -482,7 +485,7 @@ class FilterWidget extends Widget
$filterSessionArray[self::DATASET_NAME_PARAMETER] = null;
}
- $this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+ $this->_writeSession($filterSessionArray);
}
/**
@@ -503,6 +506,7 @@ class FilterWidget extends Widget
$this->hideSave = false;
$this->columnsAliases = null;
$this->filterName = null;
+ $this->fhc_controller_id = null;
if (!is_array($args) || (is_array($args) && count($args) == 0))
{
@@ -510,6 +514,15 @@ class FilterWidget extends Widget
}
else
{
+ if (!isset($args['fhc_controller_id']))
+ {
+ show_error('Dude you forgot the fhc_controller_id');
+ }
+ else
+ {
+ $this->fhc_controller_id = $args['fhc_controller_id'];
+ }
+
if ((
!isset($args[self::APP_PARAMETER])
&& !isset($args[self::DATASET_NAME_PARAMETER])
@@ -704,7 +717,7 @@ class FilterWidget extends Widget
self::DATASET_NAME_PARAMETER => $filter->retval[0]->dataset_name
);
- $this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+ $this->_writeSession($filterSessionArray);
}
else
{
@@ -719,7 +732,7 @@ class FilterWidget extends Widget
self::DATASET_NAME_PARAMETER => null
);
- $this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+ $this->_writeSession($filterSessionArray);
}
}
@@ -732,7 +745,7 @@ class FilterWidget extends Widget
{
$objToBeSaved = new stdClass();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::SELECTED_FIELDS]))
{
@@ -828,7 +841,7 @@ class FilterWidget extends Widget
// Selected fields
$selectedFields = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::SELECTED_FIELDS]))
{
$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
@@ -844,7 +857,7 @@ class FilterWidget extends Widget
{
$app = $this->app;
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::APP_PARAMETER]))
{
$app = $filterSessionArray[self::APP_PARAMETER];
@@ -860,7 +873,7 @@ class FilterWidget extends Widget
{
$datasetName = $this->datasetName;
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::DATASET_NAME_PARAMETER]))
{
$datasetName = $filterSessionArray[self::DATASET_NAME_PARAMETER];
@@ -877,7 +890,7 @@ class FilterWidget extends Widget
$columnsAliases = $this->columnsAliases;
$selectedFields = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::SELECTED_FIELDS]))
{
@@ -908,7 +921,7 @@ class FilterWidget extends Widget
// Selected filters
$selectedFilters = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::SELECTED_FILTERS]))
{
$selectedFilters = $filterSessionArray[self::SELECTED_FILTERS];
@@ -923,7 +936,7 @@ class FilterWidget extends Widget
private function _setActiveFiltersFromPost(&$activeFilters, &$activeFiltersOperation, &$activeFiltersOption)
{
$selectedFilters = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
{
@@ -994,6 +1007,8 @@ class FilterWidget extends Widget
*/
private function _setSessionFilterData()
{
+ $session = $this->_readSession();
+
$filterSessionArray = array(
self::SELECTED_FIELDS => $this->_getSelectedFieldsFromPost(),
self::SELECTED_FILTERS => $this->_getSelectedFiltersFromPost(),
@@ -1016,7 +1031,7 @@ class FilterWidget extends Widget
$filterSessionArray[self::FILTER_ID] = $this->filterId;
$filterSessionArray[self::FILTER_NAME] = $this->filterName;
- $this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+ $this->_writeSession(array_merge($session, $filterSessionArray));
}
/**
@@ -1030,7 +1045,7 @@ class FilterWidget extends Widget
$activeFiltersOperation = array();
$activeFiltersOption = array();
- $filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+ $filterSessionArray = $this->_readSession();
if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
{
@@ -1143,4 +1158,29 @@ class FilterWidget extends Widget
return $query;
}
+
+ /**
+ *
+ */
+ private function _readSession()
+ {
+ if (isset($_SESSION[self::SESSION_NAME]) && isset($_SESSION[self::SESSION_NAME][$this->fhc_controller_id]))
+ return $_SESSION[self::SESSION_NAME][$this->fhc_controller_id];
+
+ return array();
+ }
+
+ /**
+ *
+ */
+ private function _writeSession($data)
+ {
+ if (!isset($_SESSION[self::SESSION_NAME])
+ || (isset($_SESSION[self::SESSION_NAME]) && !is_array($_SESSION[self::SESSION_NAME])))
+ {
+ $_SESSION[self::SESSION_NAME] = array();
+ }
+
+ $_SESSION[self::SESSION_NAME][$this->fhc_controller_id] = $data;
+ }
}
diff --git a/application/widgets/mimetype_widget.php b/application/widgets/mimetype_widget.php
index 82fd394fb..fbb69119b 100644
--- a/application/widgets/mimetype_widget.php
+++ b/application/widgets/mimetype_widget.php
@@ -11,7 +11,7 @@ class mimetype_widget extends Widget
$data['mimetype'] = '';
$this->load->model('system/Vorlage_model');
$res = $this->Vorlage_model->getMimeTypes();
- //var_dump($res);
+
foreach ($res->retval as $obj)
{
$item = array('name' => $obj->mimetype, 'value' => $obj->mimetype);
diff --git a/skin/admintemplate.css b/public/css/sbadmin2/admintemplate.css
similarity index 99%
rename from skin/admintemplate.css
rename to public/css/sbadmin2/admintemplate.css
index 5df64ce30..e47fdd3b2 100644
--- a/skin/admintemplate.css
+++ b/public/css/sbadmin2/admintemplate.css
@@ -30,7 +30,6 @@
/*float: right; */ /* adjust as needed */
margin: 15px;
color: grey; /* adjust as needed */
-
}
.panel-heading .accordion-toggle.collapsed:before{
diff --git a/skin/admintemplate_contentonly.css b/public/css/sbadmin2/admintemplate_contentonly.css
similarity index 100%
rename from skin/admintemplate_contentonly.css
rename to public/css/sbadmin2/admintemplate_contentonly.css
diff --git a/skin/tablesort_bootstrap.css b/public/css/sbadmin2/tablesort_bootstrap.css
similarity index 100%
rename from skin/tablesort_bootstrap.css
rename to public/css/sbadmin2/tablesort_bootstrap.css
diff --git a/include/js/bootstrapper.js b/public/js/bootstrapper.js
similarity index 100%
rename from include/js/bootstrapper.js
rename to public/js/bootstrapper.js
diff --git a/include/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
similarity index 83%
rename from include/js/infocenter/infocenterDetails.js
rename to public/js/infocenter/infocenterDetails.js
index 0d409fe13..e5c966f7b 100644
--- a/include/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -1,21 +1,29 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
.
+/**
+ *
*/
+function getUrlParameter(sParam)
+{
+ var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+ sURLVariables = sPageURL.split('&'),
+ sParameterName,
+ i;
+
+ for (i = 0; i < sURLVariables.length; i++)
+ {
+ sParameterName = sURLVariables[i].split('=');
+
+ if (sParameterName[0] === sParam)
+ {
+ return sParameterName[1];
+ }
+ }
+}
+
+var fhc_controller_id = getUrlParameter("fhc_controller_id");
+
/**
* javascript file for infocenterDetails page
*/
-
$(document).ready(
function ()
{
@@ -71,6 +79,14 @@ $(document).ready(
}
);
+ //show popup with zgvinfo
+ $(".zgvinfo").click(function ()
+ {
+ var prestudentid = this.id.substr(this.id.indexOf("_") + 1);
+ openZgvInfoForPrestudent(prestudentid);
+ }
+ );
+
//prevent opening modal when Statusgrund not chosen
$(".absageModal").on('show.bs.modal', function (e)
{
@@ -99,7 +115,7 @@ $(document).ready(
var personId = $("#hiddenpersonid").val();
var notizId = $("#notizform :input[name='hiddenNotizId']").val();
var data = $(this).serializeArray();
-
+
if (notizId !== '')
{
updateNotiz(notizId, personId, data);
@@ -107,24 +123,23 @@ $(document).ready(
else
{
saveNotiz(personId, data);
- }
+ }
}
);
-
//update notiz - autofill notizform
$(document).on("click", "#notiztable tbody tr", function ()
{
var notizId = $(this).find("td:eq(3)").html();
var notizTitle = $(this).find("td:eq(1)").text();
var notizContent = this.title;
-
+
$("#notizform label:first").text("Notiz ändern").css("color", "red");
$("#notizform :input[type='reset']").css("display", "inline-block");
-
+
$("#notizform :input[name='hiddenNotizId']").val(notizId);
$("#notizform :input[name='notiztitel']").val(notizTitle);
- $("#notizform :input[name='notiz']").val(notizContent);
+ $("#notizform :input[name='notiz']").val(notizContent);
}
);
@@ -137,6 +152,15 @@ $(document).ready(
});
+function openZgvInfoForPrestudent(prestudent_id)
+{
+ var screenwidth = screen.width;
+ var popupwidth = 760;
+ var marginleft = screenwidth - popupwidth;
+ console.log(marginleft);
+ window.open("../getZgvInfoForPrestudent/" + prestudent_id, "_blank","resizable=yes,scrollbars=yes,width="+popupwidth+",height="+screen.height+",left="+marginleft);
+}
+
// -----------------------------------------------------------------------------------------------------------------
// ajax calls
@@ -145,7 +169,7 @@ function saveFormalGeprueft(personid, akteid, checked)
$.ajax({
type: "POST",
dataType: "json",
- url: "../saveFormalGeprueft/" + personid,
+ url: "../saveFormalGeprueft/" + personid + '?fhc_controller_id=' + fhc_controller_id,
data: {"akte_id": akteid, "formal_geprueft": checked},
success: function (data, textStatus, jqXHR)
{
@@ -175,7 +199,7 @@ function zgvUebernehmen(personid, prestudentid, btn)
$.ajax({
type: "POST",
dataType: "json",
- url: "../getLastPrestudentWithZgvJson/" + personid,
+ url: "../getLastPrestudentWithZgvJson/" + personid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data !== null)
@@ -215,7 +239,7 @@ function saveZgv(data)
type: "POST",
dataType: "json",
data: data,
- url: "../saveZgvPruefung/" + prestudentid,
+ url: "../saveZgvPruefung/" + prestudentid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data === prestudentid)
@@ -241,7 +265,7 @@ function saveNotiz(personid, data)
type: "POST",
dataType: "json",
data: data,
- url: "../saveNotiz/" + personid,
+ url: "../saveNotiz/" + personid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
refreshNotizen();
@@ -260,7 +284,7 @@ function updateNotiz(notizId, personId, data)
type: "POST",
dataType: "json",
data: data,
- url: "../updateNotiz/" + notizId + "/" + personId,
+ url: "../updateNotiz/" + notizId + "/" + personId + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data)
@@ -309,7 +333,7 @@ function refreshNotizen()
//readd tablesorter
formatNotizTable()
}
- );
+ );
}
function formatNotizTable()
diff --git a/include/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
similarity index 80%
rename from include/js/infocenter/infocenterPersonDataset.js
rename to public/js/infocenter/infocenterPersonDataset.js
index 8ee342d0a..7f99b6fc6 100644
--- a/include/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -1,18 +1,3 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
.
-*/
-
/**
* Javascript file for infocenter overview page
*/
@@ -48,7 +33,11 @@ function appendTableActionsHtml()
$.ajax({
url: window.location.pathname.replace('infocenter/InfoCenter', 'Filters/rowNumber'),
- method: "GET"
+ method: "GET",
+ data: {
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
+ },
+ dataType: "json"
})
.done(function(data, textStatus, jqXHR) {
@@ -72,7 +61,9 @@ function appendTableActionsHtml()
setTableActions();
}
- }).fail(function(jqXHR, textStatus, errorThrown) {});
+ }).fail(function(jqXHR, textStatus, errorThrown) {
+ alert(textStatus);
+ });
}
@@ -112,6 +103,27 @@ function setTableActions()
);
}
+/**
+ *
+ */
+function getUrlParameter(sParam)
+{
+ var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+ sURLVariables = sPageURL.split('&'),
+ sParameterName,
+ i;
+
+ for (i = 0; i < sURLVariables.length; i++)
+ {
+ sParameterName = sURLVariables[i].split('=');
+
+ if (sParameterName[0] === sParam)
+ {
+ return sParameterName[1];
+ }
+ }
+}
+
/**
* Refreshes the side menu
*/
@@ -120,7 +132,9 @@ function refreshSideMenu()
$.ajax({
url: window.location.pathname+"/setNavigationMenuArray",
method: "GET",
- data: {}
+ data: {
+ fhc_controller_id: getUrlParameter("fhc_controller_id")
+ }
})
.done(function(data, textStatus, jqXHR) {
diff --git a/include/js/tablesort/tablesort.js b/public/js/tablesort/tablesort.js
similarity index 69%
rename from include/js/tablesort/tablesort.js
rename to public/js/tablesort/tablesort.js
index c1c171959..7ee70a002 100644
--- a/include/js/tablesort/tablesort.js
+++ b/public/js/tablesort/tablesort.js
@@ -1,22 +1,3 @@
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
.
- */
-/**
- * provides helper functions for adding mottie tablesorter
- * enables easier configuration of the tablesorter by providing a common default configuration
- */
-
/**
* adds tablesorter to specified tableid, german date format, default theme
* @param tableid
diff --git a/rdf/projekt.rdf.php b/rdf/projekt.rdf.php
index 8af5bf541..386b50fe5 100644
--- a/rdf/projekt.rdf.php
+++ b/rdf/projekt.rdf.php
@@ -34,7 +34,7 @@ else
$projekt_obj = new projekt();
if(isset($_REQUEST['filter']))
{
- if($_REQUEST['filter']=='')
+ if($_REQUEST['filter']=='' || $_REQUEST['filter']=='alle')
$projekt_obj->getProjekte($oe);
if($_REQUEST['filter']=='aktuell')
$projekt_obj->getProjekteAktuell(false, $oe);
@@ -68,8 +68,8 @@ for ($i=0;$i
result);$i++)
'.$projekt->ende.'
'.$datum_obj->formatDatum($projekt->ende,'d.m.Y').'
'.$projekt->budget.'
- '.$projekt->farbe.'
- '.$projekt->anzahl_ma.'
+ '.$projekt->farbe.'
+ '.$projekt->anzahl_ma.'
'.$projekt->aufwand_pt.'
'.$projekt->aufwandstyp_kurzbz.'
'."\n";
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 5b5cfe5cb..c618b3535 100755
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -795,6 +795,7 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
else
echo '
Created table system.tbl_extensions';
+
// GRANT SELECT ON TABLE system.tbl_extensions TO web;
$qry = 'GRANT SELECT ON TABLE system.tbl_extensions TO web;';
if (!$db->db_query($qry))
@@ -845,6 +846,20 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
echo '
Altered sequence system.tbl_extensions_id_seq';
}
+// Adds primary key to system.tbl_extensions using column extension_id
+if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'pk_extensions_extension_id'"))
+{
+ if ($db->db_num_rows($result) == 0)
+ {
+ $qry = "ALTER TABLE system.tbl_extensions ADD CONSTRAINT pk_extensions_extension_id PRIMARY KEY (extension_id);";
+
+ if (!$db->db_query($qry))
+ echo 'system.tbl_extensions '.$db->db_last_error().'
';
+ else
+ echo '
system.tbl_extensions: added primary key on column extension_id';
+ }
+}
+
// UNIQUE INDEX uidx_extensions_name_version
if ($result = $db->db_query("SELECT 0 FROM pg_class WHERE relname = 'uidx_extensions_name_version'"))
{
@@ -2218,6 +2233,20 @@ if($result = $db->db_query("SELECT view_definition FROM information_schema.views
}
}
+// OE_KURZBZ in system.tbl_filters auf 32 Zeichen verlängert
+if($result = $db->db_query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='system' AND TABLE_NAME='tbl_filters' AND COLUMN_NAME = 'oe_kurzbz' AND character_maximum_length=16"))
+{
+ if($db->db_num_rows($result)>0)
+ {
+ $qry = " ALTER TABLE system.tbl_filters ALTER COLUMN oe_kurzbz TYPE varchar(32)";
+
+ if(!$db->db_query($qry))
+ echo 'system.tbl_filters '.$db->db_last_error().'
';
+ else
+ echo '
Spalte oe_kurzbz in system.tbl_filters von varchar(16) auf varchar(32) geändert
';
+ }
+}
+
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo 'Pruefe Tabellen und Attribute!
';