Skip to content

Allow to assign software to users #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kcybulski wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow to assign software to users #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c07e661
Add closing tag
kcybulski Aug 16, 2016
c5f63c7
Add "User Associations" tab to Software,
kcybulski Aug 16, 2016
dfc9c79
Show number of licenses used by users
kcybulski Aug 16, 2016
f6aa754
Update database
kcybulski Aug 16, 2016
c8fe2d6
Add list of userd software on Edit User page
kcybulski Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//sivann at gmail.com 2008-2014

$version=file_get_contents("VERSION");
$fordbversion=6;
$fordbversion=7;

/***********************************************************************
***********************************************************************
Expand Down
37 changes: 32 additions & 5 deletions php/editsoftware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@
db_exec($dbh,$sql);
}

// user relations
if (!isset($_POST['userlnk'])) $userlnk=array();
//update software - item links (installed into)
//remove old links for this object
$sql="delete from users2soft where softid=$id";
db_exec($dbh,$sql);
//add new links for each checked checkbox
for ($i=0;$i<count($userlnk);$i++) {
$sql="INSERT into users2soft (softid,userid) values ($id,".$userlnk[$i].")";
db_exec($dbh,$sql);
}

//invoice relations
if (!isset($_POST['invlnk'])) $invlnk=array();
Expand Down Expand Up @@ -209,6 +220,7 @@
<ul>
<li><a href="#tab1"><?php te("Software Data");?></a></li>
<li><a href="#tab2"><?php te("Item Associations");?></a></li>
<li><a href="#tab6"><?php te("User Associations");?></a></li>
<li><a href="#tab3"><?php te("Invoice Associations");?></a></li>
<li><a href="#tab4"><?php te("Contract Associations");?></a></li>
<li><a href="#tab5"><?php te("Upload Files");?></a></li>
Expand Down Expand Up @@ -296,12 +308,27 @@
if ($lictype=="1") {$t1="checked";$t0="";$t2="";}
if ($lictype=="2") {$t2="checked";$t0="";$t1="";}
?>
<tr>
<tr>
<td class='tdt'>License Per:</td>
<td>
<input style='width:10%' type=radio <?php echo $t0?> name='lictype' value='0'>Box
<input style='width:10%' type=radio <?php echo $t1?> name='lictype' value='1'>CPU
<input style='width:10%' type=radio <?php echo $t2?> name='lictype' value='2'>Core
<table>
<tr>
<td>
<input style='width:10%' type='radio' <?php echo $t0?> name='lictype' value='0'/>Box
</td>
<td>
<input style='width:10%' type='radio' <?php echo $t1?> name='lictype' value='1'/>CPU
</td>
</tr>
<tr>
<td>
<input style='width:10%' type='radio' <?php echo $t2?> name='lictype' value='2'/>Core
</td>
<td>
<input style='width:10%' type='radio' <?php echo $t3?> name='lictype' value='3'/>User
</td>
</tr>
</table>
</td>
</tr>

Expand Down Expand Up @@ -476,7 +503,7 @@
"target=_blank href='$scriptname?action=edititem&id=".$ir['id']."'><div class='editid'>".
$ir['id'].
"</div></a></td>";
echo "<td $cls>".$typeid2name[$ir['itemtypeid']].
echo "<td $cls>".$typeid2name[$ir['itemtypeid']]. "&nbsp;</td>".
"<td $cls>".$agents[$ir['manufacturerid']]['title']. "&nbsp;</td>".
"<td $cls>".$ir['model']. "&nbsp;</td>".
"<td $cls>".$ir['label']."&nbsp;</td>".
Expand Down
21 changes: 21 additions & 0 deletions php/edituser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,27 @@
echo $institems;
}
?>
<div id='softwares' class='relatedlist'><?php te("SOFTWARE");?></div>
<?php
if (is_numeric($id)) {
$sql="SELECT software.id, agents.title || ' ' || software.stitle || ' ' || software.sversion || ' [".
" ID:' || software.id || ']' as txt ".
"FROM agents,software,users2soft WHERE ".
" agents.id=software.manufacturerid AND users2soft.softid=software.id".
" AND users2soft.userid='$id' ";
$sthi=db_execute($dbh,$sql);
$ri=$sthi->fetchAll(PDO::FETCH_ASSOC);
$nitems=count($ri);
$institems="";
for ($i=0;$i<$nitems;$i++) {
$x=($i+1).": ".$ri[$i]['txt'];
if ($i%2) $bcolor="#D9E3F6"; else $bcolor="#ffffff";
$institems.="\t<div style='margin:0;padding:0;background-color:$bcolor'>".
"<a href='$scriptname?action=editsoftware&amp;id={$ri[$i]['id']}'>$x</a></div>\n";
}
echo $institems;
}
?>
</div>
</div>
</td>
Expand Down
19 changes: 15 additions & 4 deletions php/listsoftware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,32 +67,43 @@
foreach($r as $k => $v) { ${$k} = $v; } // get all columns as variables

//print a table row
if ($lictype<3) {
$sql="SELECT items.id i_id, status,manufacturerid,model,dnsname,cpuno,corespercpu from items,item2soft ".
" where item2soft.itemid=items.id AND item2soft.softid={$r['id']}";
} else {
$sql="SELECT users.id i_id, userdesc from users,users2soft ".
" where users2soft.userid=users.id AND users2soft.softid={$r['id']}";
}
$sthi=db_execute($dbh,$sql);
$ri=$sthi->fetchAll(PDO::FETCH_ASSOC);
$nitems=count($ri);
$institems="";
$licitems=0;

for ($i=0;$i<$nitems;$i++) {
$rstatus=(int)$ri[$i]['status'];
if ($rstatus==1) { $attr="style='background-color:green;font-weight:bold;color:#efefef' title='Status: Stored'"; }
elseif ($rstatus==2) { $attr="style='background-color:red;font-weight:bold;' title='Status: Defective'"; }
elseif ($rstatus==3) { $attr="style='background-color:#cecece;font-weight:bold;' title='Status: Obsolete'"; }
else { $attr=" title='Status: In Use' "; }

if ($lictype<3) {
$x=($i+1).": <span $attr >({$ri[$i]['i_id']}) </span>".$agents[$ri[$i]['manufacturerid']]['title']." ".$ri[$i]['model']." ".$ri[$i]['dnsname'];

$action = 'edititem';
} else {
$x=($i+1).": <span $attr >({$ri[$i]['i_id']}) </span>".$ri[$i]['userdesc'];
$action = 'edituser';
}
if ($i%2) $bcolor="#D9E3F6";
//if ($i%2) $bcolor="#ECF1FB";
else $bcolor="#ffffff";
$institems.="<div style='margin:0;padding:0;background-color:$bcolor'>".
"<a href='$scriptname?action=edititem&amp;id={$ri[$i]['i_id']}'>$x</a></div>";
"<a href='$scriptname?action=$action&amp;id={$ri[$i]['i_id']}'>$x</a></div>";

if (empty($lictype) || $lictype==0) { $licitems++; } //per box
elseif ($lictype==1) { $licitems+=$ri[$i]['cpuno']; } //per cpu
elseif ($lictype==2) { $licitems+=$ri[$i]['cpuno']*$ri[$i]['corespercpu']; } //per core
elseif ($lictype==3) { $licitems++; } //per user
}//items


Expand Down Expand Up @@ -128,7 +139,7 @@
if ($licqty<$licitems) $style="style='font-weight:bold;color:red'";
elseif ($licqty==$licitems) $style="style='font-weight:normal;color:black'";
elseif ($licqty>$licitems) $style="style='font-weight:bold;color:#00aa00'";

$mend=strlen($maintend)?date($dateparam,$maintend):"";
$mendkey=strlen($maintend)?date("Ymd",$maintend):"0";
$d=strlen($purchdate)?date($dateparam,$purchdate):"";
Expand Down
4 changes: 4 additions & 0 deletions updates/db/6_7.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
begin transaction;
CREATE TABLE users2soft (userid INTEGER, softid INTEGER, instdate INTEGER);
update settings set dbversion=7;
commit;