From 6ad9ed620e0797cb0dba70c182ff3e076067def7 Mon Sep 17 00:00:00 2001
From: Skylar <admin@netsyms.com>
Date: Wed, 18 May 2016 16:51:21 -0600
Subject: [PATCH] Add create capability

---
 .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes
 .../2.2.1/taskArtifacts/fileHashes.bin        | Bin 149380 -> 149436 bytes
 .../2.2.1/taskArtifacts/fileSnapshots.bin     | Bin 1044230 -> 1236631 bytes
 .../2.2.1/taskArtifacts/taskArtifacts.bin     | Bin 84770 -> 92782 bytes
 platforms/android/assets/www/js/main.js       |   1 +
 .../android/assets/www/screens/home.html      | 191 ++++++++++++++++--
 .../android/assets/www/screens/login.html     |   2 +-
 www/screens/home.html                         | 157 ++++++++++++--
 www/screens/login.html                        |   2 +-
 9 files changed, 321 insertions(+), 32 deletions(-)

diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index 68a395cb8e37febb7550d4db280013f82ad49138..2f21392d327090c019215f36388bfaa0bb61e968 100644
GIT binary patch
literal 17
VcmZQBcb(j%J7wKj1~A}T0st|b1j7IT

literal 17
VcmZQBcb(j%J7wKj1~A~=4FEB*1la%p

diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index ca2348f27cd34f6d60a507138395ea001b6ba10d..ebb4e780150af5f954351b671452dbeb613f29bb 100644
GIT binary patch
delta 2647
zcmZ|R4NOy46bJD4UR#h-CL&*oOdME>N?`-hfd&->K|vgf4vl~ay7`3~K<At?6hFE|
z+!5bEQDmSLt5Av*1VJRsip<EIW@duAP3L6dw2DGxuIDk+dzVSl()8E=IrrYa-urg!
zvufC9mFwWZGWf?nJ7IdBgfBhL1t_%RR0<InzC%~52(=TB?dZQz6%??-{yW>qS@;o#
z5nsUPaMcHUb&<tuEX=~%JEMqZSTw`sG7mE_qLT>MR*o`&NbOF5M?Jz)r<s)yNC6Xr
z(ASi)8P==ax0$;$3lR?awCrv7GrbsRdc22^Va!c#*@8<4)5m8TzD>S!ZQX3s%;uYO
zmMx}FF?W}LHJ8ebv5oi995!y97JJZ3e($pnFE-P$ITJA^)`u;522SN;iJ@nuq8w`K
zx(_ks<Ye(}hDlAf_JQ5y#AMl<8idZRzssPB1ZGtv!j<;NGUz3N3oJ&ci>meo?~_C+
zX806@kk#2TKB<=_yL*j9slIwZ42P-6&{71$Pwl(-t8_$i45j2ooIhA=$Sx9GT}E5+
zcL^W-f+d8_@Ir~7Q}Y{a){yOU#R!QdDh{+Hur~1st$U`_!ylT(#5zVFMezTkd=)G@
zMU-O0b|B1FM%;qjQ$%wnY&F6|jYtU>sf2hM!h$5*b?}-@u=YH{k)qS#5OA94!DyEt
zWa=h5z*-X6GT|b>khazZj+4NRdx?qq;=iUr7YVFp6GEiV2nHN0$R3NgBOD7hwm>uq
zk^{a7bB{+|fgBQ;U}5Gh(-XEqBLyzP%(E(H)bhC@)YraLSa+GC@FXZJ$?kT+*d%t*
zb0wrwApagAzo}|29H}Ii*J3I{SN!!K;W`Bp1A?XW$>$)`k_qWI2<i7$#PQQ#QNxl5
z+e(`v?L2IuB4S63ybfx1;w$NhRE^SGtb7Cywd70`!d~Io)=|y74UktOV`aq1*1)|h
z;NvPXVkt*xw+(NA{Z-_MCBo$MQX1BPfl7$ZVZx>*%J8+0tR(Nm_Xl<suY}1I*b3j(
zlX^c-NTWa;g^8Aptqhdu$lim$1l9Z6OK_V?Se9Vo7w;HPaH=K~QU`=j=9LygbTv6D
zSssFeK2QcZ6o{`PT=uPVg+{8Br52%b)%7ZPPJvh`rK{}sfeB~G=3>*1$S_m=>o?>j
zaU{6;BiQGOI-!6{4CzBSll&kHIw+71MF{FhodH8?$Wm6q)yq}%S3@ubu5p-9iHhEZ
zj2d$0*1ZV6kM7mOX$oxI5Zqo&wubvuDX|KnATHq{xa!H~j#&sfSBiGRd<v|D3Hohl
zGwM|Og^9$TB~8SLEV=7v{yfK#;}RF5^fWr#@k(dvA{7fGj?8(dn`Z;*A4w)=&i8pQ
z<qPSIBn_pk@zY{HEs&~aAymsc5US&?M^M!)axinrS?$K(ruz($qCD8t^AW#g1Xay4
z9c86LzKo9!qN)x30VVtB-2|xE?XI^O$)4~c7Q(#k=nWw(#}dRm#blo%<1ybA%91<2
zm2eci%G{W*kDAG{E<{KsEX9PBFGc(s7uH?BGm%w~Ho0&an9A)jo$3q|*f}+UKM}^c
z>r=L~z1;XQw)3)Yb>BT6;`*y~jXHb3o#}LB=bO)dYYR;E<PYnq<D;`#xn7gaPG7J1
z|C9estHG1MAj&BpoXh3<pyzDu+d8$DW)xuuh8gS>+8<M(1h-RiedtRz!iN~YpRk-~
z?MesuW1gJHZ1c<})nUG;&2iCx?oZfQ<JquuW6G?WEU7lSY}eq_{vD-v_i~Ia8TBHI
zw^eX>fAVJhV-BOJyI;5JBNW{5(TUfRl|9Bgu@5Z%%pdtQV*H)KLP@pwF(&9j75;0^
Wx4B96f9rkKn>K^@Rdo$>0{#KyNr@-`

delta 2470
zcmY+`3s6*57zglsE_YdWfy9-^3K|HwE(=nQi3%}@Z*e3Hjd)D1mdL0WOr{df1gVVp
zg8HCqzQqR*7i3xFh6-wCtoYVw&<b-j6J$s<5E;w%yF`1=&ak_4e)s=<=bXI{P8X;)
z7N`n6JUD!b4Hvs@9~1F=s8F)aY}l%IAb*uwzSU3H2+6HQoi!0*%iJ$4T74D|;W*(t
zd~ef?EU?6sq&wP$xNA{%{T%c?Tq+B+1LtrIA*Or$6>umIpdj!RLeq}rCm@^wE)Kz{
zOI#0`EF>WCb)5y`x?mFEVV{@sBFbXdo&##J+D25H;0UDHl;+*wRWX`^+*AZ!*L@%2
zD(D&GFvq>>4>Z8$3aS*jZ9<s-z^Z~XG;k|o5E2%iRY5Nee0T|h-;cW|z}RC{DQ?)?
z2zPo+Dsgcy(P;)ZILI5v$IdxLU=I@*as*+1^!+cy>vTYI5XU3m$r=aFCc1;dfS?b%
zaZrqUPDT%QAZvnf{Cvwd_aMteFS}4ccoBJ631%9IYZ5|=+ptDxHziX$7`q>#@{dic
z;QdOf6q&gZ;ii;&8wxAwNzGh|@X3UbU}$0z!W4wdeNoHd6`dgNB7$;q?o<e?qIz)V
z6of8=w;QaYft1PTXmWe>>u{6?-q42$|A@OYpp6D%T8D6}E=&QQ$LSu)IS7-E{_+FF
z(x51M6XB<*C6^$N1};ioc~Wb}XVA!ikGyhiSbBq4IE~OvK9Kjl*j!Tuq17~KqOeKx
zxjVs-%7E?)0;k&>1N*A!?RAXA@mc5lZ$JwJ3M;}sXv+c@Go4WHMCe>UJ6?=_Nu7rZ
z`JNDOUUUJnnSkJlfz*;NjaW?w)a5w-aRhk;9cFqJdigSMjQ__h`u%M`4>{E{3_Lh=
zWC<kJ&;g|mVPSq+J$zY1&s8BW+vO#sft5)(G+?4AX~~tZEOaH^uQ>kEi0$bxi2*nH
zS4#6A;SU)M2=g$J)X|}UG7H^%;2O}B?Yj(jnS}B%CbDZk_Xn?9I-!<tu}`d9c0z0|
zJu8=DOl%AFP(dC8!gYjq%fHq_BU4IgMhJS^FF_9jf?UcF)M9{;6LfRo93~D|7OgE_
z%>RGwbAE5(@OGDwR@lWH@ALv8q`zq+++aXG1fgX1oLS&hM|V)kXYKB=7BfUKF!DW2
zXm%C&z?wRG-OjxT<*S<;p^5=lKZN>KUa!GJrj)Q1!QooQpD<FQn|tOW_$CzOzybzT
z@&YR!|K4laDkT`HdzIRVk>dXDHt{Ua+i$qSUL0RLW}=rEs%0J=f;`__zN5NC63$$)
zinW+YH1f&fUN)o1Kp8h?MyZ$)&Qx=ht7%<V)QQf+nQD%Cn2F2H8!g^t`#7mlGVh&B
z5VMCf)s&y2bemPn#MlU?+K`(l-i}w3;P~bM$<>>b22tB!zu8FEX@n;faZfR6G$(e5
zZPN*TpI6BbfTdk2d!%_Y2=SppF7j5Kcv<Nvru&cpX_JwZ``X+x1&eW9{#<-lRy5U$
zr8D^eX=x7W<we*)h7TQl<f-rBAs?P<k~VE1X_<OMe6;fp_n6Mc>{NrPZ@%r!Bn#{X
z2Oj55^$WD1tq7DR_mGnV^)!Pm2kPzLelryODg&jdePr$%wi!Ki!ZsW?Uf!SvjYT0I
z9K#3BwadhM^!8@%z~%9_FZlfQ$G@T6p?r7G4X3N0SbwwbG(JC>IWVRFDvo^=Y&(j(
zmVZ@r)ARTr#$c;adl0G~w?|5I^!zYieO26ZzE!i*@YM8VMUFPFQ?6t5JAj9A5ofaS
KBgT8(vws2l?4Y**

diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 68e1a74510cedf0a437d6fd138ee1c964e8ed2d4..f05a6abbd475f9e18d8124a4dffaf3f8ab3234c4 100644
GIT binary patch
delta 1356
zcmZp>XFq+f_Xc|j#zT`GBt8iA%da?odOP<^1`rUsv2(J9<VpUnyQi6buRH^b38tOh
z{6eyUS>SMzd*@f<+gT9Nl=jUDvJs2|H|3WcHNV>w0TvZ<o<4bl+z){#9n+aVX}JhM
z1n;&@ULbEF@a#j#tAo=6Zi58{Vm5ESARoXiAl|rrs%Nye3dGdZJ)0$zCol<E?cN`@
zcS+ezhyiy3H!o0)WaOV0QU1P4r46Dq;r-?hY8s3J@fTB`G@g=VhlpOOo-Cjd$ltx5
z(ct;6k6<x@)8{5fX#CKqJ+b0}S<u0&U_t)(Z2!>!NZenqPIzPET=9()jM<t4JlX?1
z7=f4xh?#+y1&CRJm<@>8ftUk`If0l9h`E872Z(urm~VT42miKZ+pG6-->?zTREVu&
z*SW3v`NM+i@!$U#PyZ;))Ue&)Je!z^Kw$Ho*AJID%Rc7bwz7Gmkj?hSsZ7!`B3U|2
zr_UHOFy!+BF)Ii&GEHaP#1%4GA(3Zl06XjS1`|H^?Uu87)m;VA&A&gL@h5Npwuijt
z+=3VuOy9ViH)Fau2b0qF%Wrs@WQEjzU4IX<YN{|0bA#~qx;nl<LriBMlwuE=o?yWz
zyxnaB-(^3%W^et^cT-rX)SK%l$ZX~=AZ`NT?F)qY{TQbwX7agBSFmIep01$6$UgnO
z7{AH%jT@QVrlm6rO*fdw$~8Sel%GdXfayj~N{FJA>Hg5hsoL|4b*Ep{U`Ez>PL%(k
z7%1NQb&XDdY+_UgVtEjr9{8WdgP?hacNjyaD-^TwPyg_M-<ktt)E-ISgVVph<^L&h
z?1%ufko2l4uYR2o)h+oAPPiB5S6ti9ugeRJ*C_opb3WHP1W(gcds=0A{2-xt)fE#G
zWVp$c6nb)6sdo8^#mNsY=X*~VJjhtHUEmj6A}h=6t1G{3-#d%9LK>Sw!$o`r)9tKT
z#kQZ>#ydrmAI<vd7e!b@r!RQMYeQtrv+Ovw`0VzAI=;C=*sNO^%9ppjXCj}o9HvJ}
zPYKQ9n{z2j35>y?ce#~*PW9N<$hFaLMLW)vpwzixE5Vc?Ab@7xbjJzop=b%=%i24Q
fkc4nKS?}HF2f;7c-prKx<f;7tluXJecc=pZ^7Hu8

delta 155
zcmbQf*SqbW{RVpp#%+@wBtA^`kUY3qQL3DI^9I=f#>o=$A0{g(7;Mf^@L=A2Lb-!!
zbB0<V<K~O%@{E%?G(9J0YQ7iv4+RWB@F_cE>Bh#n;u|Lfvo{BLv<G-F0x=U1GXpUT
j5VHa?8xXStF$WNH0x=g5a|1CC5c2{t-}V3x{%y+u==VC8

diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 87886dd91a241bb34422bd31cbb92ecd2fd8c977..212e788edf6a936b02a6ed78183bca4b3e1060e7 100644
GIT binary patch
delta 680
zcmZ29jrH9X)(N7PEDT_9pc_aXgs`{WXJBB=1G5>ul^7V9_CnZ3*$fOko*;I#cC^Jt
zzX=jdzV|mjkl4n=bo$xk8PdAUjFADGPe{*UVu`%CnsehrTk(w_Rts$o@R-*u&ispk
zf%zA6O~b$a&lYg5S*l-~vOeb1^T`_~IxlwI&M3fti~Uhvf#8JKS}L>mKfL@ACb9Y5
zws1xkmcM^ICmZfIm|XvWYqP-x=Ol6VMg|7<MkblP*2<kb9(#xRR&EUSIkIT_2PZ~{
z$$NbrCMz72nyzBZXgZzIhEamCVETDy#<=Mj4vaF>Eln5?Y!7l|>|@+sWyCm>ary*V
zMy~1aJs4%S1Ets*rz?0d{$n{U#9BIC&xvu<_AOS7c>?lhjDaDs9*CENFcV()Dxccc
zzzx#Coeac|Ak3_>ZFQIP6U~N2T0cS^JznOL=28LLdGuXa)SAf?I>c0-eP56Va<rfT
z5OaVq^KrffVZ1^nc`lRIiFv%}mOD6EafQ@og)<3^({*GRwYDD;V0_3p`SSV9$rJB;
zOb-%fTs--H`(Z&b+fA+cU2%^#9+ohXGT5d_oVLwhPg^pBB4g?1%jYjMvV48_y$}HJ
CL-_Up

delta 230
zcmaENg>}(1)(N7Pj0|9Kpc_aX1TlTjz2#<L;PC{pEsXXqgRz5a?5Dxl%-x=m8~r9o
zFd1cUeju@piD}#Y$up#NnHf$$+k8TL4in3}SFvk1KC~6z_+hos<^Yd*&Frk}7#LXB
zF>c?P!f44n+2IS<<h`-8w@=Styv(?H*~PO7?94#hnGZ5<&kJRo$p}=SHa)?g@xb&6
zwv6+p+d45W<^VY;`jUv;WJgbl=?B~xZ3P-??VIQ1$0l*`m`8~I;Cj3LgA?No#?202
NOqsTCv0}^<001&EO<({3

diff --git a/platforms/android/assets/www/js/main.js b/platforms/android/assets/www/js/main.js
index 2d67bdf..a54652b 100644
--- a/platforms/android/assets/www/js/main.js
+++ b/platforms/android/assets/www/js/main.js
@@ -8,6 +8,7 @@
  * API base URL
  */
 APIURL = "http://snipe-mobile-api/snipeapi/app/";
+//APIURL = "http://localhost:8000/";
 username = "";
 
 /**
diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html
index 5e1666a..cca0891 100644
--- a/platforms/android/assets/www/screens/home.html
+++ b/platforms/android/assets/www/screens/home.html
@@ -13,10 +13,45 @@
                 <br />
                 <div class="input-group">
                     <span class="input-group-addon"><i class="fa fa-fw fa-map-marker"></i></span>
-                    <select class="form-control" id="item-location">
+                    <select class="form-control" id="item-location" placeholder="Location">
 
                     </select>
                 </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-tag"></i></span>
+                    <select class="form-control" id="item-status" placeholder="Status">
+
+                    </select>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-desktop"></i></span>
+                    <input type="text" class="form-control" placeholder="Asset Tag" id="item-asset-tag" />
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-asset-tag');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-credit-card"></i></span>
+                    <input type="text" class="form-control" placeholder="Serial" id="item-serial" />
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-serial');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-th"></i></span>
+                    <select class="form-control" id="item-model" placeholder="Model">
+
+                    </select>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-hdd-o"></i></span>
+                    <input type="text" class="form-control" id="item-hdd-secure" placeholder="Hard Drive Secure (Y/N)" />
+                </div>
                 <br />
                 <div class="input-group item-not-asset">
                     <span class="input-group-addon"><i class="fa fa-hashtag fa-fw"></i></span>
@@ -26,6 +61,9 @@
                 <div class="input-group">
                     <span class="input-group-addon"><i class="fa fa-barcode fa-fw"></i></span>
                     <input type="text" placeholder="Order Number" id="item-order-number" class="form-control"/>
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-order-number');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
                 </div>
                 <input type="hidden" value="asset" id="item-from" />
                 <input type="hidden" value="" id="item-id" />
@@ -43,27 +81,39 @@
         <div class="col-lg-12 text-center">
             <div class="input-group">
                 <span class="input-group-btn">
-                    <button id="scancodebtn" onclick="scancode();" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    <button id="scancodebtn" onclick="scancode('#searchbox');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
                 </span>
                 <input type="text" placeholder="Lookup" class="form-control" id="searchbox"/>
                 <div class="input-group-btn">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span id="searchtypelabel">Assets</span> <span class="caret"></span></button>
                     <ul class="dropdown-menu">
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Assets');">Assets</a></li>
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Acc');">Accessories</a></li>
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Con');">Consumables</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Assets');"><i class="fa fa-fw fa-desktop"></i> Assets</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Acc');"><i class="fa fa-fw fa-keyboard-o"></i> Accessories</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Con');"><i class="fa fa-fw fa-tint"></i> Consumables</a></li>
                     </ul>
                 </div>
                 <span class="input-group-btn">
                     <button id="searchbtn" onclick="dosearch($('#searchbox').val(), $('#searchtypelabel').text().toLowerCase());" class="btn btn-primary"><i class="fa fa-search"></i></button>
                 </span>
             </div>
-            <hr />
-            <div class="list-group" id="searchresults">
-
+        </div>
+        <br />
+        <div class="col-xs-4">
+            <div class="dropdown">
+                <button id="additembtn" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-plus"></i> <span class="caret"></span></button>
+                <ul class="dropdown-menu">
+                    <li><a href="#" onclick="additem('asset');" id="addassetbtn"><i class="fa fa-fw fa-desktop"></i> Asset</a></li>
+                    <li><a href="#" onclick="additem('accessory');" id="addaccessorybtn"><i class="fa fa-fw fa-keyboard-o"></i> Accessory</a></li>
+                    <li><a href="#" onclick="additem('consumable');" id="addconsumablebtn"><i class="fa fa-fw fa-tint"></i> Consumable</a></li>
+                    <li><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li>
+                </ul>
             </div>
         </div>
     </div>
+    <hr />
+    <div class="list-group" id="searchresults">
+
+    </div>
 </div>
 <script>
 
@@ -100,6 +150,32 @@
         return listitem;
     }
 
+    function additem(from) {
+        $("[id^='item-']").val('');
+        $('#item-from').val(from);
+        $('#item-info-header').text('Create ' + from);
+        if (from == 'asset') {
+            $('.item-not-asset').css('display', 'none');
+            $('.item-only-asset').css('display', '');
+            getstatusselector(0, from);
+            getmodelselector(0);
+        } else if (from == 'hdd') {
+            $('#item-from').val('asset');
+            $('.item-not-asset').css('display', 'none');
+            $('.item-only-asset').css('display', '');
+            getstatusselector(0, from);
+            getmodelselector(0, from);
+            $("#item-model option:not(:contains('Hard Drive'))").remove();
+            $("#item-status option:not(:contains('HDD: '))").remove();
+            $('#item-name').val('Hard Drive');
+        } else {
+            $('.item-only-asset').css('display', 'none');
+            $('.item-not-asset').css('display', '');
+        }
+        getlocationselector(0, from);
+        $('#item-modal').modal('show');
+    }
+
     function getlocationselector(id, from) {
         $.ajax({
             type: "GET",
@@ -113,7 +189,7 @@
             },
             success: function (data) {
                 if (data.status === 'OK') {
-                    var innerhtml = ""
+                    var innerhtml = "<option selected hidden>Location</option>"
                     for (var i = 0; i < data.list.length; i++) {
                         innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
                     }
@@ -130,6 +206,76 @@
         });
     }
 
+    function getstatusselector(id, from) {
+        $.ajax({
+            type: "GET",
+            url: mkApiUrl("getstatus"),
+            data: {id: id, from: from},
+            cache: false,
+            crossDomain: true,
+            dataType: 'json',
+            xhrFields: {
+                withCredentials: true
+            },
+            success: function (data) {
+                if (data.status === 'OK') {
+                    var innerhtml = "<option selected hidden>Status</option>"
+                    for (var i = 0; i < data.list.length; i++) {
+                        if (from == 'hdd' && data.list[i].name.indexOf('HDD') == -1) {
+                            continue;
+                        }
+                        innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
+                    }
+                    $('#item-status').html(innerhtml);
+                    // Set the selected index to the actual one
+                    if (data.itemstatus != 0) {
+                        $('#item-status').val(data.itemstatus);
+                    }
+                } else {
+                    alert('An error occurred: ' + data.message);
+                }
+            },
+            error: function () {
+                alert('An error occurred. Check your connection.');
+            }
+        });
+    }
+
+    function getmodelselector(id, from) {
+        $.ajax({
+            type: "GET",
+            url: mkApiUrl("getmodel"),
+            data: {id: id, from: 'assets'},
+            cache: false,
+            crossDomain: true,
+            dataType: 'json',
+            xhrFields: {
+                withCredentials: true
+            },
+            success: function (data) {
+                if (data.status === 'OK') {
+                    var innerhtml = "<option selected hidden>Model</option>"
+                    for (var i = 0; i < data.list.length; i++) {
+                        if (from == 'hdd' && data.list[i].name != 'Hard Drive') {
+                            continue;
+                        }
+                        innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
+                    }
+                    $('#item-model').html(innerhtml);
+                    // Set the selected index to the actual one
+                    if (data.model != 0) {
+                        $('#item-model').val(data.model);
+                    }
+                } else {
+                    alert('An error occurred: ' + data.message);
+                }
+            },
+            error: function () {
+                alert('An error occurred. Check your connection.');
+            }
+        });
+    }
+
     function saveitem() {
         $.ajax({
             type: "POST",
@@ -140,6 +286,11 @@
                 name: $('#item-name').val(),
                 qty: $('#item-qty').val(),
                 location: $('#item-location').val(),
+                status: $('#item-status').val(),
+                serial: $('#item-serial').val(),
+                model: $('#item-model').val(),
+                asset_tag: $('#item-asset-tag').val(),
+                hdd_secure: $('#item-hdd-secure').val(),
                 order_number: $('#item-order-number').val()
             },
             cache: false,
@@ -179,11 +330,23 @@
                     getlocationselector(id, from);
                     $('#item-id').val(id);
                     $('#item-from').val(from);
-                    $('#item-info-header').text(data.results.name);
+                    if (data.results.name == '') {
+                        $('#item-info-header').text("Edit " + data.results.asset_tag);
+                    } else {
+                        $('#item-info-header').text("Edit " + data.results.name);
+                    }
                     $('#item-name').val(data.results.name);
                     if (from == 'assets') {
                         $('.item-not-asset').css('display', 'none');
+                        $('.item-only-asset').css('display', '');
+                        $('#item-serial').val(data.results.serial);
+                        $('#item-asset-tag').val(data.results.asset_tag);
+                        $('#item-hdd-secure').val(data.results._snipeit_hard_drive_secure__y_n_);
+                        getstatusselector(id, from);
+                        getmodelselector(id);
                     } else {
+                        $('.item-only-asset').css('display', 'none');
+                        $('.item-not-asset').css('display', '');
                         $('#item-qty').val(data.results.qty);
                     }
                     $('#item-order-number').val(data.results.order_number);
@@ -244,14 +407,16 @@
         });
     }
 
-    function scancode() {
+    function scancode(target) {
         try {
             cordova.plugins.barcodeScanner.scan(
                     function (result) {
                         if (!result.cancelled) {
                             //alert(result.format + ": " + result.text);
-                            $('#searchbox').val(result.text);
-                            dosearch(result.text, $('#searchtypelabel').text().toLowerCase());
+                            $(target).val(result.text);
+                            if (target == '#searchbox') {
+                                dosearch(result.text, $('#searchtypelabel').text().toLowerCase());
+                            }
                         }
                     });
         } catch (ex) {
diff --git a/platforms/android/assets/www/screens/login.html b/platforms/android/assets/www/screens/login.html
index b144ed3..f61fdb6 100644
--- a/platforms/android/assets/www/screens/login.html
+++ b/platforms/android/assets/www/screens/login.html
@@ -12,7 +12,7 @@
                     </div>
                     <div class="input-group">
                         <span class="input-group-addon" id="basic-addon-usericon"><i class="fa fa-user"></i></span>
-                        <input type="text" placeholder="Username/Email" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
+                        <input type="text" placeholder="Username" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
                     </div>
                     <br />
                     <div class="input-group">
diff --git a/www/screens/home.html b/www/screens/home.html
index 699521e..cca0891 100644
--- a/www/screens/home.html
+++ b/www/screens/home.html
@@ -13,17 +13,45 @@
                 <br />
                 <div class="input-group">
                     <span class="input-group-addon"><i class="fa fa-fw fa-map-marker"></i></span>
-                    <select class="form-control" id="item-location">
+                    <select class="form-control" id="item-location" placeholder="Location">
 
                     </select>
                 </div>
                 <br class="item-only-asset"/>
                 <div class="input-group item-only-asset">
                     <span class="input-group-addon"><i class="fa fa-fw fa-tag"></i></span>
-                    <select class="form-control" id="item-status">
+                    <select class="form-control" id="item-status" placeholder="Status">
 
                     </select>
                 </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-desktop"></i></span>
+                    <input type="text" class="form-control" placeholder="Asset Tag" id="item-asset-tag" />
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-asset-tag');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-credit-card"></i></span>
+                    <input type="text" class="form-control" placeholder="Serial" id="item-serial" />
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-serial');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-th"></i></span>
+                    <select class="form-control" id="item-model" placeholder="Model">
+
+                    </select>
+                </div>
+                <br class="item-only-asset"/>
+                <div class="input-group item-only-asset">
+                    <span class="input-group-addon"><i class="fa fa-fw fa-hdd-o"></i></span>
+                    <input type="text" class="form-control" id="item-hdd-secure" placeholder="Hard Drive Secure (Y/N)" />
+                </div>
                 <br />
                 <div class="input-group item-not-asset">
                     <span class="input-group-addon"><i class="fa fa-hashtag fa-fw"></i></span>
@@ -33,6 +61,9 @@
                 <div class="input-group">
                     <span class="input-group-addon"><i class="fa fa-barcode fa-fw"></i></span>
                     <input type="text" placeholder="Order Number" id="item-order-number" class="form-control"/>
+                    <span class="input-group-btn">
+                        <button id="scancodebtn" onclick="scancode('#item-order-number');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    </span>
                 </div>
                 <input type="hidden" value="asset" id="item-from" />
                 <input type="hidden" value="" id="item-id" />
@@ -50,27 +81,39 @@
         <div class="col-lg-12 text-center">
             <div class="input-group">
                 <span class="input-group-btn">
-                    <button id="scancodebtn" onclick="scancode();" class="btn btn-default"><i class="fa fa-barcode"></i></button>
+                    <button id="scancodebtn" onclick="scancode('#searchbox');" class="btn btn-default"><i class="fa fa-barcode"></i></button>
                 </span>
                 <input type="text" placeholder="Lookup" class="form-control" id="searchbox"/>
                 <div class="input-group-btn">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span id="searchtypelabel">Assets</span> <span class="caret"></span></button>
                     <ul class="dropdown-menu">
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Assets');">Assets</a></li>
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Acc');">Accessories</a></li>
-                        <li><a href="#" onclick="$('#searchtypelabel').text('Con');">Consumables</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Assets');"><i class="fa fa-fw fa-desktop"></i> Assets</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Acc');"><i class="fa fa-fw fa-keyboard-o"></i> Accessories</a></li>
+                        <li><a href="#" onclick="$('#searchtypelabel').text('Con');"><i class="fa fa-fw fa-tint"></i> Consumables</a></li>
                     </ul>
                 </div>
                 <span class="input-group-btn">
                     <button id="searchbtn" onclick="dosearch($('#searchbox').val(), $('#searchtypelabel').text().toLowerCase());" class="btn btn-primary"><i class="fa fa-search"></i></button>
                 </span>
             </div>
-            <hr />
-            <div class="list-group" id="searchresults">
-
+        </div>
+        <br />
+        <div class="col-xs-4">
+            <div class="dropdown">
+                <button id="additembtn" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-plus"></i> <span class="caret"></span></button>
+                <ul class="dropdown-menu">
+                    <li><a href="#" onclick="additem('asset');" id="addassetbtn"><i class="fa fa-fw fa-desktop"></i> Asset</a></li>
+                    <li><a href="#" onclick="additem('accessory');" id="addaccessorybtn"><i class="fa fa-fw fa-keyboard-o"></i> Accessory</a></li>
+                    <li><a href="#" onclick="additem('consumable');" id="addconsumablebtn"><i class="fa fa-fw fa-tint"></i> Consumable</a></li>
+                    <li><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li>
+                </ul>
             </div>
         </div>
     </div>
+    <hr />
+    <div class="list-group" id="searchresults">
+
+    </div>
 </div>
 <script>
 
@@ -107,6 +150,32 @@
         return listitem;
     }
 
+    function additem(from) {
+        $("[id^='item-']").val('');
+        $('#item-from').val(from);
+        $('#item-info-header').text('Create ' + from);
+        if (from == 'asset') {
+            $('.item-not-asset').css('display', 'none');
+            $('.item-only-asset').css('display', '');
+            getstatusselector(0, from);
+            getmodelselector(0);
+        } else if (from == 'hdd') {
+            $('#item-from').val('asset');
+            $('.item-not-asset').css('display', 'none');
+            $('.item-only-asset').css('display', '');
+            getstatusselector(0, from);
+            getmodelselector(0, from);
+            $("#item-model option:not(:contains('Hard Drive'))").remove();
+            $("#item-status option:not(:contains('HDD: '))").remove();
+            $('#item-name').val('Hard Drive');
+        } else {
+            $('.item-only-asset').css('display', 'none');
+            $('.item-not-asset').css('display', '');
+        }
+        getlocationselector(0, from);
+        $('#item-modal').modal('show');
+    }
+
     function getlocationselector(id, from) {
         $.ajax({
             type: "GET",
@@ -120,7 +189,7 @@
             },
             success: function (data) {
                 if (data.status === 'OK') {
-                    var innerhtml = ""
+                    var innerhtml = "<option selected hidden>Location</option>"
                     for (var i = 0; i < data.list.length; i++) {
                         innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
                     }
@@ -136,7 +205,7 @@
             }
         });
     }
-    
+
     function getstatusselector(id, from) {
         $.ajax({
             type: "GET",
@@ -150,13 +219,53 @@
             },
             success: function (data) {
                 if (data.status === 'OK') {
-                    var innerhtml = ""
+                    var innerhtml = "<option selected hidden>Status</option>"
                     for (var i = 0; i < data.list.length; i++) {
+                        if (from == 'hdd' && data.list[i].name.indexOf('HDD') == -1) {
+                            continue;
+                        }
                         innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
                     }
                     $('#item-status').html(innerhtml);
                     // Set the selected index to the actual one
-                    $('#item-status').val(data.itemstatus);
+                    if (data.itemstatus != 0) {
+                        $('#item-status').val(data.itemstatus);
+                    }
+                } else {
+                    alert('An error occurred: ' + data.message);
+                }
+            },
+            error: function () {
+                alert('An error occurred. Check your connection.');
+            }
+        });
+    }
+
+    function getmodelselector(id, from) {
+        $.ajax({
+            type: "GET",
+            url: mkApiUrl("getmodel"),
+            data: {id: id, from: 'assets'},
+            cache: false,
+            crossDomain: true,
+            dataType: 'json',
+            xhrFields: {
+                withCredentials: true
+            },
+            success: function (data) {
+                if (data.status === 'OK') {
+                    var innerhtml = "<option selected hidden>Model</option>"
+                    for (var i = 0; i < data.list.length; i++) {
+                        if (from == 'hdd' && data.list[i].name != 'Hard Drive') {
+                            continue;
+                        }
+                        innerhtml += "<option value=\"" + data.list[i].id + "\">" + data.list[i].name + "</option>";
+                    }
+                    $('#item-model').html(innerhtml);
+                    // Set the selected index to the actual one
+                    if (data.model != 0) {
+                        $('#item-model').val(data.model);
+                    }
                 } else {
                     alert('An error occurred: ' + data.message);
                 }
@@ -178,6 +287,10 @@
                 qty: $('#item-qty').val(),
                 location: $('#item-location').val(),
                 status: $('#item-status').val(),
+                serial: $('#item-serial').val(),
+                model: $('#item-model').val(),
+                asset_tag: $('#item-asset-tag').val(),
+                hdd_secure: $('#item-hdd-secure').val(),
                 order_number: $('#item-order-number').val()
             },
             cache: false,
@@ -217,12 +330,20 @@
                     getlocationselector(id, from);
                     $('#item-id').val(id);
                     $('#item-from').val(from);
-                    $('#item-info-header').text(data.results.name);
+                    if (data.results.name == '') {
+                        $('#item-info-header').text("Edit " + data.results.asset_tag);
+                    } else {
+                        $('#item-info-header').text("Edit " + data.results.name);
+                    }
                     $('#item-name').val(data.results.name);
                     if (from == 'assets') {
                         $('.item-not-asset').css('display', 'none');
                         $('.item-only-asset').css('display', '');
+                        $('#item-serial').val(data.results.serial);
+                        $('#item-asset-tag').val(data.results.asset_tag);
+                        $('#item-hdd-secure').val(data.results._snipeit_hard_drive_secure__y_n_);
                         getstatusselector(id, from);
+                        getmodelselector(id);
                     } else {
                         $('.item-only-asset').css('display', 'none');
                         $('.item-not-asset').css('display', '');
@@ -286,14 +407,16 @@
         });
     }
 
-    function scancode() {
+    function scancode(target) {
         try {
             cordova.plugins.barcodeScanner.scan(
                     function (result) {
                         if (!result.cancelled) {
                             //alert(result.format + ": " + result.text);
-                            $('#searchbox').val(result.text);
-                            dosearch(result.text, $('#searchtypelabel').text().toLowerCase());
+                            $(target).val(result.text);
+                            if (target == '#searchbox') {
+                                dosearch(result.text, $('#searchtypelabel').text().toLowerCase());
+                            }
                         }
                     });
         } catch (ex) {
diff --git a/www/screens/login.html b/www/screens/login.html
index b144ed3..f61fdb6 100644
--- a/www/screens/login.html
+++ b/www/screens/login.html
@@ -12,7 +12,7 @@
                     </div>
                     <div class="input-group">
                         <span class="input-group-addon" id="basic-addon-usericon"><i class="fa fa-user"></i></span>
-                        <input type="text" placeholder="Username/Email" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
+                        <input type="text" placeholder="Username" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
                     </div>
                     <br />
                     <div class="input-group">