Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Browse Source
This commit is contained in:
Lorenzo Giacomelli
2016-01-20 17:26:41 +01:00
parent 9ab4306d99 d9072a3617
commit d808af5ff4
12 changed files with 382 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/lib/gui/DatatablesHelper.php
+15 -1
View File
@@ -53,7 +53,7 @@ class DatatablesHelper {
}
else {
if ($obj->$key instanceof MongoDate){
$rval->$key = date("d-m-Y",$obj->$key->sec);
$rval->$key = date("d-m-Y H:i",$obj->$key->sec);
}
else {
$rval->$key = $obj->$key;
@@ -83,6 +83,7 @@ class DatatablesHelper {
'useForm.submit();'.
'}'.
'});';
$i++;
}
$buttonDiv.='<form action="" method="POST" style="display:none;"><input type="hidden" name="id" value=""/></form>';
}
@@ -92,10 +93,18 @@ class DatatablesHelper {
$colLabels = "<tr>";
$jsCols = array();
$i=0;
foreach ($columns as $col){
$colLabels.= '<th>'.$col["label"].'</th>';
$jsCols[]= '{"data":"'.$col["data"].'"}';
if (array_key_exists("sort",$col)){
$defaultOrder[]= '['.$i.',"'.$col["sort"].'"]';
}
$i++;
}
$colLabels.= '</tr>';
@@ -114,6 +123,11 @@ class DatatablesHelper {
"type": "POST"
},
"columns": [ <?php echo implode(",", $jsCols);?> ],
<?php
if (sizeof($defaultOrder)>0){
echo '"order": ['. implode(",", $defaultOrder) . '],';
}
?>
"initComplete": function () {
$("div.<?php echo $toolbarClass;?>").prepend('<?php echo $buttonDiv;?>');
<?php echo $buttonJs;?>
private/lib/gui/MenuGenerator.php
+4 -1
View File
@@ -14,7 +14,10 @@ class MenuGenerator {
array("label"=>"Da accettare","page"=>"unacceptedNotizie.php","requires"=>AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR),
array("label"=>"Respinte","page"=>"rejectedNotizie.php","requires"=>AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)
)),
array("label"=>"Giornalisti","page"=>"listGiornalisti.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN),
array("label"=>"Giornalisti", "subvoices"=>array(
array("label"=>"Nuovo","page"=>"editGiornalisti.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN),
array("label"=>"Lista","page"=>"listGiornalisti.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN),
)),
array("label"=>"Commenti","page"=>"unacceptedCommenti.php","requires"=>AdminModel::ADMIN_TYPE_COMMENTI_SUPERVISOR),
public/admin/deleteAmministratori.php
+64
View File
@@ -0,0 +1,64 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../load.php");
GUIHandler::generateHtmlHeaders(array(),true);
if (!AdminLoginManager::isLogged()){
GUIHandler::redirect("admin/login.php");
}
else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_SUPERADMIN)){
GUIHandler::redirect("admin/index.php");
}
MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$id = PostHandler::get("id");
if (is_null($id) || strcmp("", $id)==0){
GUIHandler::redirect("admin/listAmministratori.php");
}
$giornalista = GlobalVariables::get("dao")->getFirst("AdminModel",array("id"=>$id));
if (is_null($giornalista)){
GUIHandler::redirect("admin/listAmministratori.php");
}
$confirm = PostHandler::get("confirm");
if (!is_null($confirm) && strcmp("", $confirm)!=0){
if (strcmp("true", $confirm)==0){
GlobalVariables::get("dao")->delete($giornalista);
}
GUIHandler::redirect("admin/listAmministratori.php");
}
?>
<div>
<?php
echo "Sei sicuro di voler eliminare l'amministratore ".$giornalista->nome." ".$giornalista->cognome."?";
?>
<form id="giornalistaDeletionForm" method="POST" action="">
<input type="hidden" name="confirm" value="" />
<input type="hidden" name="id" value="<?php echo $id;?>" />
</form>
<a href="#" id="giornalistaDeletionForm_confirm" >Conferma</a>
<a href="#" id="giornalistaDeletionForm_cancel" >Annulla</a>
</div>
<script type="text/javascript">
$(document).ready(function(event){
$("#giornalistaDeletionForm_confirm").click(function(event){
$("form#giornalistaDeletionForm input[type=hidden][name=confirm]").val("true");
$("form#giornalistaDeletionForm").submit();
});
$("#giornalistaDeletionForm_cancel").click(function(event){
$("form#giornalistaDeletionForm input[type=hidden][name=confirm]").val("false");
$("form#giornalistaDeletionForm").submit();
});
});
</script>
public/admin/deleteGiornalisti.php
+70
View File
@@ -0,0 +1,70 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../load.php");
GUIHandler::generateHtmlHeaders(array(),true);
if (!AdminLoginManager::isLogged()){
GUIHandler::redirect("admin/login.php");
}
else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
GUIHandler::redirect("admin/index.php");
}
MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$id = PostHandler::get("id");
if (is_null($id) || strcmp("", $id)==0){
GUIHandler::redirect("admin/listGiornalisti.php");
}
$giornalista = GlobalVariables::get("dao")->getFirst("AdminModel",array("id"=>$id));
if (is_null($giornalista)){
GUIHandler::redirect("admin/listGiornalisti.php");
}
$confirm = PostHandler::get("confirm");
if (!is_null($confirm) && strcmp("", $confirm)!=0){
if (strcmp("true", $confirm)==0){
$giornalista->removeRole(AdminModel::ADMIN_TYPE_EDITORE);
if ( ($giornalista->roles & 0) == $giornalista->roles){
GlobalVariables::get("dao")->delete($giornalista);
}
else {
GlobalVariables::get("dao")->save($giornalista);
}
}
GUIHandler::redirect("admin/listGiornalisti.php");
}
?>
<div>
<?php
echo "Sei sicuro di voler eliminare il giornalista ".$giornalista->nome." ".$giornalista->cognome."?";
?>
<form id="giornalistaDeletionForm" method="POST" action="">
<input type="hidden" name="confirm" value="" />
<input type="hidden" name="id" value="<?php echo $id;?>" />
</form>
<a href="#" id="giornalistaDeletionForm_confirm" >Conferma</a>
<a href="#" id="giornalistaDeletionForm_cancel" >Annulla</a>
</div>
<script type="text/javascript">
$(document).ready(function(event){
$("#giornalistaDeletionForm_confirm").click(function(event){
$("form#giornalistaDeletionForm input[type=hidden][name=confirm]").val("true");
$("form#giornalistaDeletionForm").submit();
});
$("#giornalistaDeletionForm_cancel").click(function(event){
$("form#giornalistaDeletionForm input[type=hidden][name=confirm]").val("false");
$("form#giornalistaDeletionForm").submit();
});
});
</script>
public/admin/editAmministratori.php
+88
View File
@@ -0,0 +1,88 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../load.php");
GUIHandler::generateHtmlHeaders(array(),true);
if (!AdminLoginManager::isLogged()){
GUIHandler::redirect("admin/login.php");
}
else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_SUPERADMIN)){
GUIHandler::redirect("admin/index.php");
}
MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$id = PostHandler::get("id");
$giornalista = new AdminModel();
$giornalista->nome = "";
$giornalista->cognome = "";
if (!is_null($id) && strcmp("", $id)!=0){
$giornalista = GlobalVariables::get("dao")->getFirst("AdminModel",array("id"=>$id));
if (is_null($giornalista)){
GUIHandler::redirect("admin/listAmministratori.php");
}
}
$action = PostHandler::get("action");
if (!is_null($action) && strcmp("", $action)!=0){
if (strcmp("cancel", $action)==0){
GUIHandler::redirect("admin/listAmministratori.php");
}
else if (strcmp("save", $action)==0){
$giornalista->nome = PostHandler::get("nome");
$giornalista->cognome = PostHandler::get("cognome");
foreach (AdminModel::$ADMIN_TYPES as $maskVal=>$data){
if ($data["typeFlags"]!=AdminModel::TYPE_FLAG_HIDDEN){
$cur = PostHandler::get($maskVal);
if (!is_null($cur) && $cur = $maskVal){
$giornalista->addRole($maskVal);
}
else {
$giornalista->removeRole($maskVal);
}
}
}
GlobalVariables::get("dao")->save($giornalista);
GUIHandler::redirect("admin/listAmministratori.php");
}
}
?>
<div>
<form id="giornalistaForm" method="POST" action="">
<input type="hidden" name="action" value="" />
<input type="hidden" name="id" value="<?php echo $id;?>" />
<input type="text" name="nome" value="<?php echo $giornalista->nome; ?>" />
<input type="text" name="cognome" value="<?php echo $giornalista->cognome; ?>" />
<br/>
<?php
foreach (AdminModel::$ADMIN_TYPES as $maskVal=>$data){
if ($data["typeFlags"]!=AdminModel::TYPE_FLAG_HIDDEN){
echo '<input type="checkbox" name="'.$maskVal.'" value="'.$maskVal.'" '.($giornalista->hasRole($maskVal)?'checked="checked"':"").' />'.$data["label"]."<br/>";
}
}
?>
</form>
<a href="#" id="giornalistaForm_salva" >Salva</a>
<a href="#" id="giornalistaForm_annulla">Annulla</a>
</div>
<script type="text/javascript">
$(document).ready(function(event){
$("#giornalistaForm_salva").click(function(event){
$("form#giornalistaForm input[type=hidden][name=action]").val("save");
$("form#giornalistaForm").submit();
});
$("#giornalistaForm_annulla").click(function(event){
$("form#giornalistaForm input[type=hidden][name=action]").val("cancel");
$("form#giornalistaForm").submit();
});
});
</script>
public/admin/editGiornalisti.php
+71
View File
@@ -0,0 +1,71 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../load.php");
GUIHandler::generateHtmlHeaders(array(),true);
if (!AdminLoginManager::isLogged()){
GUIHandler::redirect("admin/login.php");
}
else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
GUIHandler::redirect("admin/index.php");
}
MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$id = PostHandler::get("id");
$giornalista = new AdminModel();
$giornalista->nome = "";
$giornalista->cognome = "";
$giornalista->addRole(AdminModel::ADMIN_TYPE_EDITORE);
if (!is_null($id) && strcmp("", $id)!=0){
$giornalista = GlobalVariables::get("dao")->getFirst("AdminModel",array("id"=>$id));
if (is_null($giornalista)){
GUIHandler::redirect("admin/listGiornalisti.php");
}
}
$action = PostHandler::get("action");
if (!is_null($action) && strcmp("", $action)!=0){
if (strcmp("cancel", $action)==0){
GUIHandler::redirect("admin/listGiornalisti.php");
}
else if (strcmp("save", $action)==0){
$giornalista->nome = PostHandler::get("nome");
$giornalista->cognome = PostHandler::get("cognome");
GlobalVariables::get("dao")->save($giornalista);
GUIHandler::redirect("admin/listGiornalisti.php");
}
}
?>
<div>
<form id="giornalistaForm" method="POST" action="">
<input type="hidden" name="action" value="" />
<input type="hidden" name="id" value="<?php echo $id;?>" />
<input type="text" name="nome" value="<?php echo $giornalista->nome; ?>" />
<input type="text" name="cognome" value="<?php echo $giornalista->cognome; ?>" />
</form>
<a href="#" id="giornalistaForm_salva" >Salva</a>
<a href="#" id="giornalistaForm_annulla">Annulla</a>
</div>
<script type="text/javascript">
$(document).ready(function(event){
$("#giornalistaForm_salva").click(function(event){
$("form#giornalistaForm input[type=hidden][name=action]").val("save");
$("form#giornalistaForm").submit();
});
$("#giornalistaForm_annulla").click(function(event){
$("form#giornalistaForm input[type=hidden][name=action]").val("cancel");
$("form#giornalistaForm").submit();
});
});
</script>
public/admin/listAmministratori.php
+39
View File
@@ -0,0 +1,39 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../load.php");
GUIHandler::generateHtmlHeaders(array(),true);
if (!AdminLoginManager::isLogged()){
GUIHandler::redirect("admin/login.php");
}
else if (!AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_SUPERADMIN)){
GUIHandler::redirect("admin/index.php");
}
MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$columns = array(
array("label"=>"Nome","data"=>"nome","sort"=>"asc"),
array("label"=>"Cognome","data"=>"cognome"),
array("label"=>"Maschera Permessi","data"=>"roles"),
array("label"=>"Ultimo Accesso","data"=>"lastConnection.date")
);
$buttons = array(
array("icon"=>"icon-medium-blue icon-editmed","page"=>"editAmministratori.php"),
array("icon"=>"icon-medium-blue icon-remove","page"=>"deleteAmministratori.php")
);
?>
<div>
<?php
$details = DatatablesHelper::generateTable("amministratoriTableBackend.php",$columns,array("buttons"=>$buttons));
?>
</div>
public/admin/listGiornalisti.php
+5 -3
View File
@@ -19,12 +19,14 @@ MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$columns = array(
array("label"=>"Nome","data"=>"nome"),
array("label"=>"Cognome","data"=>"cognome")
array("label"=>"Nome","data"=>"nome","sort"=>"asc"),
array("label"=>"Cognome","data"=>"cognome"),
array("label"=>"Ultimo Accesso","data"=>"lastConnection.date")
);
$buttons = array(
array("icon"=>"icon-medium-blue icon-editmed","page"=>"editAdmin.php")
array("icon"=>"icon-medium-blue icon-editmed","page"=>"editGiornalisti.php"),
array("icon"=>"icon-medium-blue icon-remove","page"=>"deleteGiornalisti.php")
);
?>
public/admin/listNotizie.php
+1 -1
View File
@@ -22,7 +22,7 @@ $columns = array(
array("label"=>"Titolo","data"=>"titolo"),
array("label"=>"Sottotitolo","data"=>"sottotitolo"),
array("label"=>"Autore","data"=>"about.author"),
array("label"=>"Data","data"=>"about.data")
array("label"=>"Data","data"=>"about.data","sort"=>"desc")
);
$buttons = array(
public/admin/tablesBackends/amministratoriTableBackend.php
+24
View File
@@ -0,0 +1,24 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 20/gen/2016
*/
require_once(dirname(__FILE__)."/../../load.php");
$useModel = "AdminModel";
$permissionFlagRequired = AdminModel::ADMIN_TYPE_SUPERADMIN;
$exposedFields = array(
"nome"=>null,
"cognome"=>null,
"lastConnection"=>array("date"=>null),
"roles"=>null,
"id"=>null
);
$ret = DatatablesHelper::getResult($useModel, $permissionFlagRequired, $exposedFields);
echo json_encode($ret);
?>
public/admin/tablesBackends/giornalistiTableBackend.php
+1
View File
@@ -11,6 +11,7 @@ $permissionFlagRequired = AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR;
$exposedFields = array(
"nome"=>null,
"cognome"=>null,
"lastConnection"=>array("date"=>null),
"id"=>null
);
public/admin/tablesBackends/notizieTableBackend.php
-30
View File
@@ -6,36 +6,6 @@ Creation Date: 14/gen/2016
require_once(dirname(__FILE__)."/../../load.php");
// $ret = new stdClass();
// $ret->draw = $_POST["draw"];
// $arr = array();
// $ele = new stdClass();
// $ele->Sottotitolo = print_r($_POST,true);
// $ele->Titolo = "asd";
// $ele->about = new stdClass();
// $ele->about->autore = "autore";
// $ele->about->data = "data";
// $arr[] = $ele;
// for ($i=0; $i<9; $i++){
// $ele = new stdClass();
// $ele->Sottotitolo = "asd";
// $ele->Titolo = "asd";
// $ele->about = new stdClass();
// $ele->about->autore = "autore";
// $ele->about->data = "data";
// $arr[] = $ele;
// }
// $ret->recordsTotal = 10;
// $ret->recordsFiltered = 10;
// $ret->data = $arr;
// echo json_encode($ret);
// die();
// OK
$useModel = "NotiziaModel";
$permissionFlagRequired = AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR;
$exposedFields = array(