MrkPi/CSiCoDB2
3
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

SelectCommesseChiuse #2

Merged
Mrk merged 3 commits from SelectCommesseChiuse into master 2026-05-08 14:09:43 +02:00
Conversation 0 Commits 3 Files Changed 4
+24 -22
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Models/Commesse_Model.php
+7 -5
View File
@@ -80,8 +80,9 @@ class Commesse_Model extends Model{
// Creo la string SQL: // Creo la string SQL:
// - join fra le tabelle // - join fra le tabelle
$sql = 'SELECT Commesse.coIDcommessa AS val, Commesse.coNome AS txt FROM Commesse, Orari WHERE Commesse.coIDcommessa=Orari.orIDcommessa'; $sql = 'SELECT Commesse.coIDcommessa AS val, Commesse.coNome AS txt FROM Commesse, Orari WHERE Commesse.coIDcommessa=Orari.orIDcommessa';
// - elimino le commesse chiuse: // 2026/05/06 su richiesta di Irene, lascio selezionabili le commesse chiuse.
$sql .= ' AND coIDstatoCommessa<>\'Chiusa\''; //// - elimino le commesse chiuse:
//$sql .= ' AND coIDstatoCommessa<>\'Chiusa\'';
// - Applico il filtro temporale: // - Applico il filtro temporale:
$sql .= ' AND Orari.orData>=\'' . session()->get('filter_dal') . '\' AND Orari.orData<=\'' . session()->get('filter_al') . " 23:59:59" . '\''; $sql .= ' AND Orari.orData>=\'' . session()->get('filter_dal') . '\' AND Orari.orData<=\'' . session()->get('filter_al') . " 23:59:59" . '\'';
// - applico eventuale filtro per lavoratore // - applico eventuale filtro per lavoratore
@@ -121,8 +122,9 @@ class Commesse_Model extends Model{
// Creo la string SQL: // Creo la string SQL:
// - join fra le tabelle\ // - join fra le tabelle\
$sql = 'SELECT Commesse.coIDcommessa AS val, CONCAT(Commesse.coNome, \' : \', Commesse.coDescrizione) AS txt FROM Commesse, Spese WHERE Commesse.coIDcommessa=Spese.spIDcommessa'; $sql = 'SELECT Commesse.coIDcommessa AS val, CONCAT(Commesse.coNome, \' : \', Commesse.coDescrizione) AS txt FROM Commesse, Spese WHERE Commesse.coIDcommessa=Spese.spIDcommessa';
// - elimino le commesse chiuse: // 2026/05/06 su richiesta di Irene, lascio selezionabili le commesse chiuse.
$sql .= ' AND coIDstatoCommessa<>\'Chiusa\''; //// - elimino le commesse chiuse:
//$sql .= ' AND coIDstatoCommessa<>\'Chiusa\'';
// - Applico il filtro temporale: // - Applico il filtro temporale:
$sql .= ' AND Spese.spData>=\'' . session()->get('filter_dal') . '\' AND Spese.spData<=\'' . session()->get('filter_al') . " 23:59:59" . '\''; $sql .= ' AND Spese.spData>=\'' . session()->get('filter_dal') . '\' AND Spese.spData<=\'' . session()->get('filter_al') . " 23:59:59" . '\'';
// - applico eventuale filtro per lavoratore // - applico eventuale filtro per lavoratore
@@ -156,7 +158,7 @@ class Commesse_Model extends Model{
// Ritorna le coppie val,txt per compilare il select delle commesse // Ritorna le coppie val,txt per compilare il select delle commesse (nell'insert new)
public function get_select(){ public function get_select(){
$query = $this->query('SELECT coIDcommessa AS val, CONCAT(coNome, \' : \', coDescrizione) AS txt FROM Commesse WHERE coIDstatoCommessa<>\'Chiusa\' ORDER BY coUpdatedAt DESC'); $query = $this->query('SELECT coIDcommessa AS val, CONCAT(coNome, \' : \', coDescrizione) AS txt FROM Commesse WHERE coIDstatoCommessa<>\'Chiusa\' ORDER BY coUpdatedAt DESC');
return $query->getResult(); return $query->getResult();
app/Views/cmpnts/layout/footer.php
+17 -17
View File
@@ -1,17 +1,17 @@
<center> <center>
<p class="footer"> <p class="footer">
<br /> <br />
<?php if (ENVIRONMENT === 'development'): ?> <?php if (ENVIRONMENT === 'development'): ?>
<!-- In development, visualizzo informazioni utili --> <!-- In development, visualizzo informazioni utili -->
<?php echo 'C.Si.Co. s.r.l. <br />CSiCoDB Version <strong>0.0.8</strong> - CodeIgniter Version <strong>' . CodeIgniter\CodeIgniter::CI_VERSION . '</strong> <br />' ?> <?php echo 'C.Si.Co. s.r.l. <br />CSiCoDB Version <strong>0.0.9</strong> - CodeIgniter Version <strong>' . CodeIgniter\CodeIgniter::CI_VERSION . '</strong> <br />' ?>
Elenco link utili - Elenco link utili -
<a href="http://codeigniter.com/user_guide/index.html">Codeigniter 4 Manual</a> - <a href="http://codeigniter.com/user_guide/index.html">Codeigniter 4 Manual</a> -
<a href="https://getbootstrap.com/docs/4.5/getting-started/introduction/">Bootstrap 4 Manual</a> - <a href="https://getbootstrap.com/docs/4.5/getting-started/introduction/">Bootstrap 4 Manual</a> -
<a href="https://dev.mysql.com/doc/refman/8.0/en/">MySQL Reference</a> - <a href="https://dev.mysql.com/doc/refman/8.0/en/">MySQL Reference</a> -
<a href="https://www.w3schools.com/tags/">HTML Tag Reference</a> <a href="https://www.w3schools.com/tags/">HTML Tag Reference</a>
<?php else: ?> <?php else: ?>
<!-- In production, visualizzo solo la versione --> <!-- In production, visualizzo solo la versione -->
<?php echo 'C.Si.Co. s.r.l. <br />CSiCoDB Version <strong>0.0.8</strong> <br />' ?> <?php echo 'C.Si.Co. s.r.l. <br />CSiCoDB Version <strong>0.0.9</strong> <br />' ?>
<?php endif; ?> <?php endif; ?>
</p> </p>
</center> </center>
vendor/_Placeholder
Vendored
View File
Whitespace-only changes.
writable/_Placeholder
View File
Whitespace-only changes.