OCS Inventory: OCSReports

Merge lp:~goneri/ocsinventory-ocsreports/assettag-trunk into lp:ocsinventory-ocsreports

  1. assettag-trunk
  2. Merge into trunk
Proposed by Gonéri Le Bouder
Status: Merged
Merge reported by: Gonéri Le Bouder
Merged at revision: not available
Proposed branch: lp:~goneri/ocsinventory-ocsreports/assettag-trunk
Merge into: lp:ocsinventory-ocsreports
Diff against target: None lines
To merge this branch: bzr merge lp:~goneri/ocsinventory-ocsreports/assettag-trunk
Reviewer Review Type Date Requested Status
OCS Inventory Dev Team Pending
Review via email: mp+11866@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gonéri Le Bouder (goneri) wrote :

Add assettag support. Some element still need to be ported from the stable branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doublons.php'
2--- doublons.php 2009-09-10 09:02:46 +0000
3+++ doublons.php 2009-09-14 15:53:05 +0000
4@@ -157,6 +157,7 @@
5 case "hostname_serial": echo $l->g(193); break ;
6 case "hostname_macaddress": echo $l->g(194); break ;
7 case "macaddress_serial": echo $l->g(195); break ;
8+ case "assettag": echo "AssetTag"; break ;
9 case "hostname": echo $l->g(196); break ;
10 case "ssn": echo $l->g(197); break ;
11 case "macaddress": echo $l->g(198); break ;
12@@ -179,12 +180,13 @@
13 //if ($protectedPost['tri2'] == "macaddr")
14
15 $_SESSION['SQL_DATA_FIXE'][$table_name]['macaddr']="select HARDWARE_ID,networks.macaddr from networks where hardware_id in (".implode(',',$list_id[$protectedPost['detail']]).")";
16- $_SESSION['SQL_DATA_FIXE'][$table_name]['serial']="select HARDWARE_ID,bios.SSN as serial from bios where hardware_id in (".implode(',',$list_id[$protectedPost['detail']]).")";
17+ $_SESSION['SQL_DATA_FIXE'][$table_name]['serial']="select HARDWARE_ID,bios.SSN as serial, bios.assettag as assettag from bios where hardware_id in (".implode(',',$list_id[$protectedPost['detail']]).")";
18
19 //liste des champs du tableau des doublons
20 $list_fields= array(TAG_LBL=>'a.TAG',
21 'macaddr'=>'networks.macaddr',
22 'serial'=>'bios.SSN',
23+ 'assettag'=>'bios.assettag',
24 // $l->g(36)=>'b.ssn',
25 $l->g(23).": id"=>'h.ID',
26 $l->g(23).": ".$l->g(46)=>'h.LASTDATE',
27@@ -229,7 +231,7 @@
28 if ($tab_id_mes_machines != ""){
29 $queryDetails .= "";
30 }
31- $tab_options['FILTRE']=array('NAME'=>'Nom','b.ssn'=>'Num�ro de s�rie','n.macaddr'=>'Adresse MAC');
32+ $tab_options['FILTRE']=array('NAME'=>'Nom','b.ssn'=>'Num�ro de s�rie','n.macaddr'=>'Adresse MAC', 'b.assettag'=>'AssetTag');
33
34 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,'95',$tab_options);
35 echo "<br><input type='submit' value='".$l->g(177)."' name='FUSION'>";
36
37=== modified file 'files/ocsbase.sql'
38--- files/ocsbase.sql 2009-09-09 14:41:14 +0000
39+++ files/ocsbase.sql 2009-09-15 16:37:39 +0000
40@@ -33,7 +33,6 @@
41 USERAGENT VARCHAR(50) default NULL,
42 CHECKSUM BIGINT UNSIGNED default 0,
43 SSTATE INTEGER default 0,
44- ASSETTAG VARCHAR(255) default NULL,
45 IPSRC VARCHAR(255) default NULL,
46 PRIMARY KEY (ID),
47 INDEX NAME (NAME),
48@@ -89,8 +88,10 @@
49 BMANUFACTURER VARCHAR(255) default NULL,
50 BVERSION VARCHAR(255) default NULL,
51 BDATE VARCHAR(255) default NULL,
52+ ASSETTAG VARCHAR(255) default NULL,
53 PRIMARY KEY (HARDWARE_ID),
54- INDEX SSN (SSN)
55+ INDEX SSN (SSN),
56+ INDEX ASSETTAG (ASSETTAG)
57 ) ENGINE=INNODB ;
58
59 CREATE TABLE config (
60@@ -544,7 +545,6 @@
61 ALTER TABLE hardware ADD COLUMN SSTATE INTEGER default 0;
62 ALTER TABLE hardware ADD COLUMN DEFAULTGATEWAY VARCHAR(255) default NULL;
63 ALTER TABLE hardware ADD COLUMN DNS VARCHAR(255) default NULL;
64-ALTER TABLE hardware ADD COLUMN ASSETTAG VARCHAR(255) default NULL;
65 ALTER TABLE drives ADD COLUMN CREATEDATE DATE default NULL;
66 ALTER TABLE hardware ADD COLUMN IPSRC VARCHAR(255) default NULL;
67
68@@ -560,6 +560,8 @@
69 UPDATE bios SET bios.HARDWARE_ID= (SELECT ID FROM hardware WHERE bios.DEVICEID = hardware.DEVICEID);
70 ALTER TABLE bios DROP DEVICEID;
71 ALTER TABLE bios ADD PRIMARY KEY(HARDWARE_ID);
72+ALTER TABLE bios ADD COLUMN ASSETTAG VARCHAR(255) default NULL;
73+ALTER TABLE bios ADD INDEX ASSETTAG (ASSETTAG);
74
75 ALTER TABLE accountinfo DROP PRIMARY KEY;
76 ALTER TABLE accountinfo ADD COLUMN HARDWARE_ID integer not NULL FIRST;
77
78=== modified file 'list_computors.php'
79--- list_computors.php 2009-09-10 09:02:46 +0000
80+++ list_computors.php 2009-09-14 14:25:03 +0000
81@@ -43,6 +43,7 @@
82 $l->g(36) => "e.ssn",
83 $l->g(65) => "e.smodel",
84 $l->g(209) => "e.bversion",
85+ "AssetTag (BIOS)" => "e.assettag",
86 $l->g(34) => "h.ipaddr",
87 $l->g(557) => "h.userdomain");
88 $tab_options['FILTRE']=array_flip($list_fields);
89@@ -76,4 +77,4 @@
90 tab_req($table_name,$list_fields,$default_fields,$list_col_cant_del,$queryDetails,$form_name,95,$tab_options);
91 echo "</form>";
92
93-?>
94\ No newline at end of file
95+?>
96
97=== modified file 'machine.php'
98--- machine.php 2009-09-10 09:02:46 +0000
99+++ machine.php 2009-09-14 15:53:05 +0000
100@@ -36,7 +36,7 @@
101 'OSCOMMENTS'=>$l->g(286),'WINCOMPANY'=>$l->g(51),'WINOWNER'=>$l->g(348),
102 'WINPRODID'=>$l->g(111),'WINPRODKEY'=>$l->g(553),'USERAGENT'=>$l->g(357),
103 'MEMORY'=>$l->g(26),'LASTDATE'=>$l->g(46),'LASTCOME'=>$l->g(820),'DESCRIPTION'=>$l->g(636),
104- 'NAME_RZ'=>$l->g(304)
105+ 'NAME_RZ'=>$l->g(304), 'ASSETTAG'=>'AssetTag'
106 );
107 foreach ($lbl_affich as $key=>$lbl){
108 if ($key == "MEMORY"){
109@@ -189,4 +189,4 @@
110 exit;
111
112
113-?>
114\ No newline at end of file
115+?>
116
117=== modified file 'multi.php'
118--- multi.php 2009-09-10 09:02:46 +0000
119+++ multi.php 2009-09-14 14:25:03 +0000
120@@ -720,6 +720,7 @@
121 "HARDWARE-DESCRIPTION"=>$l->g(25).": ".$l->g(53),
122 "HARDWARE-USERDOMAIN"=>$l->g(82).": ".$l->g(557),
123 "BIOS-BVERSION"=>$l->g(273).": ".$l->g(209),
124+ "BIOS-ASSETTAG"=>$l->g(273).": AssetTag",
125 "HARDWARE-USERID"=>$l->g(243).": ".$l->g(49),
126 "HARDWARE-OSCOMMENTS"=>$l->g(25).": ".$l->g(51),
127 "NETWORKS-IPGATEWAY"=>$l->g(82).": ".$l->g(207),
128
129=== modified file 'require/function_config_generale.php'
130--- require/function_config_generale.php 2009-09-10 10:43:04 +0000
131+++ require/function_config_generale.php 2009-09-14 15:53:05 +0000
132@@ -304,6 +304,8 @@
133 $AUTO_DUPLICATE['AUTO_DUPLICATE_LVL_2']=$POST['AUTO_DUPLICATE_LVL_2'];
134 $AUTO_DUPLICATE['AUTO_DUPLICATE_LVL_3']=$POST['AUTO_DUPLICATE_LVL_3'];
135 $AUTO_DUPLICATE['AUTO_DUPLICATE_LVL_4']=$POST['AUTO_DUPLICATE_LVL_4'];
136+ $AUTO_DUPLICATE['AUTO_DUPLICATE_LVL_5']=$POST['AUTO_DUPLICATE_LVL_5'];
137+ $AUTO_DUPLICATE['AUTO_DUPLICATE_LVL_6']=$POST['AUTO_DUPLICATE_LVL_6'];
138 $value=auto_duplicate_lvl_poids($AUTO_DUPLICATE,2);
139 $key='AUTO_DUPLICATE_LVL';
140 }
141@@ -342,6 +344,8 @@
142 $poids['SERIAL']=2;
143 $poids['MACADRESSE']=4;
144 $poids['MODEL']=8;
145+ $poids['UUID']=16;
146+ $poids['ASSETTAG']=32;
147 //si on veut les cases coch�es par rapport � un chiffre
148 if ($entree_sortie == 1){
149 //gestion des poids pour connaitre les cases coch�es.
150@@ -511,7 +515,15 @@
151 'BORDERCOLOR'=>'#9894B5'));
152 ligne('LOGLEVEL',$l->g(416),'radio',array(1=>'ON',0=>'OFF','VALUE'=>$values['ivalue']['LOGLEVEL']));
153 ligne('PROLOG_FREQ',$l->g(564),'input',array('END'=>$l->g(730).$sup1,'VALUE'=>$values['ivalue']['PROLOG_FREQ'],'SIZE'=>1,'MAXLENGHT'=>3,'JAVASCRIPT'=>$numeric));
154- ligne('AUTO_DUPLICATE_LVL',$l->g(427),'checkbox',array('HOSTNAME'=>'hostname','SERIAL'=>'Serial','MACADRESSE'=>'macaddress','MODEL'=>'model','CHECK'=>$check));
155+ ligne('AUTO_DUPLICATE_LVL',$l->g(427),'checkbox',array(
156+ 'HOSTNAME'=>'hostname',
157+ 'SERIAL'=>'Serial',
158+ 'MACADRESSE'=>'macaddress',
159+ 'MODEL'=>'model',
160+ 'UUID'=>'uuid',
161+ 'ASSETTAG'=>'AssetTag',
162+ 'CHECK'=>$check,
163+ ));
164 ligne('SECURITY_LEVEL',$l->g(739),'input',array('VALUE'=>$values['ivalue']['SECURITY_LEVEL'],'SIZE'=>1,'MAXLENGHT'=>3,'JAVASCRIPT'=>$numeric),'',"readonly");
165 ligne('LOCK_REUSE_TIME',$l->g(740),'input',array('END'=>$l->g(511).$sup1,'VALUE'=>$values['ivalue']['LOCK_REUSE_TIME'],'SIZE'=>1,'MAXLENGHT'=>3,'JAVASCRIPT'=>$numeric));
166 ligne('TRACE_DELETED',$l->g(415),'radio',array(1=>'ON',0=>'OFF','VALUE'=>$values['ivalue']['TRACE_DELETED']));

Subscribers

People subscribed via source and target branches