ADAM / AIAHTML5

Commit 978119820a4fed5fd2b21b3566246c3ccd9b9e26

Authored by Gagandeep
1 parent 07ec0296

remove project

Inline Side-by-side
Showing 25 changed files with 385 additions and 424 deletions
.gitignore
  View file @9781198
1 -# git ignore file  
2 -[Dd]ebug*/  
3 -*.lib  
4 -Thumbs.db  
5 -obj/  
6 -*.obj  
7 -*.exe  
8 -*.pdb  
9 -*.user  
10 -*.aps  
11 -*.pch  
12 -*.vspscc  
13 -*_i.c  
14 -*_p.c  
15 -*.ncb  
16 -*.suo  
17 -*.sln.docstates  
18 -*.tlb  
19 -*.tlh  
20 -*.bak  
21 -*.cache  
22 -*.ilk  
23 -*.log  
24 -[Dd]ebug*/  
25 -*.lib  
26 -*.sbr  
27 -obj/  
28 -[Rr]elease*/  
29 -_ReSharper*/  
30 -[Tt]est[Rr]esult*  
31 -*.vssscc  
32 -$tf*/  
33 -400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user  
34 -400-SOURCECODE\AIAHTML5.Web\bin  
35 -300-PROTOTYPES/POC/AIAHTML5  
36 -400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig  
37 -400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig  
38 -400-SOURCECODE/AIAHTML5.Web/index.html.orig  
39 -400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll  
40 -400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb  
41 -  
42 -400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig  
43 -400-SOURCECODE/.vs/config/applicationhost.config  
44 -400-SOURCECODE/.vs/config/applicationhost.config  
45 \ No newline at end of file 1 \ No newline at end of file
  2 +# git ignore file
  3 +[Dd]ebug*/
  4 +*.lib
  5 +Thumbs.db
  6 +obj/
  7 +*.obj
  8 +*.exe
  9 +*.pdb
  10 +*.user
  11 +*.aps
  12 +*.pch
  13 +*.vspscc
  14 +*_i.c
  15 +*_p.c
  16 +*.ncb
  17 +*.suo
  18 +*.sln.docstates
  19 +*.tlb
  20 +*.tlh
  21 +*.bak
  22 +*.cache
  23 +*.ilk
  24 +*.log
  25 +[Dd]ebug*/
  26 +*.lib
  27 +*.sbr
  28 +obj/
  29 +[Rr]elease*/
  30 +_ReSharper*/
  31 +[Tt]est[Rr]esult*
  32 +*.vssscc
  33 +$tf*/
  34 +400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
  35 +400-SOURCECODE\AIAHTML5.Web\bin
  36 +300-PROTOTYPES/POC/AIAHTML5
  37 +400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
  38 +400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig
  39 +400-SOURCECODE/AIAHTML5.Web/index.html.orig
  40 +400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
  41 +400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
  42 +
  43 +400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig
  44 +400-SOURCECODE/.vs/config/applicationhost.config
  45 +400-SOURCECODE/.vs/config/applicationhost.config
  46 +400-SOURCECODE/AIAHTML5.ADMIN.Web
46 \ No newline at end of file 47 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/AIAHTML5.ADMIN.Web.csproj
  View file @9781198
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <IISExpressAnonymousAuthentication /> 20 <IISExpressAnonymousAuthentication />
21 <IISExpressWindowsAuthentication /> 21 <IISExpressWindowsAuthentication />
22 <IISExpressUseClassicPipelineMode /> 22 <IISExpressUseClassicPipelineMode />
23 - <TypeScriptToolsVersion>1.4</TypeScriptToolsVersion> 23 + <TypeScriptToolsVersion>1.8</TypeScriptToolsVersion>
24 </PropertyGroup> 24 </PropertyGroup>
25 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 25 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
26 <DebugSymbols>true</DebugSymbols> 26 <DebugSymbols>true</DebugSymbols>
@@ -63,46 +63,38 @@ @@ -63,46 +63,38 @@
63 <Content Include=".editorconfig" /> 63 <Content Include=".editorconfig" />
64 <Content Include="e2e\tsconfig.e2e.json" /> 64 <Content Include="e2e\tsconfig.e2e.json" />
65 <Content Include="package.json" /> 65 <Content Include="package.json" />
66 - <Content Include="src\app\shared\enum.js.map" />  
67 - <Content Include="src\app\shared\global.js.map" />  
68 - <Content Include="src\assets\.gitkeep" />  
69 - <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.eot" />  
70 - <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.ttf" />  
71 - <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.woff" />  
72 - <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.woff2" />  
73 - <Content Include="src\tsconfig.app.json" />  
74 - <Content Include="src\tsconfig.spec.json" />  
75 - <Content Include="tsconfig.json" />  
76 - <Content Include="tslint.json" />  
77 - <None Include="Web.Debug.config">  
78 - <DependentUpon>Web.config</DependentUpon>  
79 - </None>  
80 - <None Include="Web.Release.config">  
81 - <DependentUpon>Web.config</DependentUpon>  
82 - </None>  
83 - </ItemGroup>  
84 - <ItemGroup>  
85 - <Content Include=".gitignore" />  
86 - <Content Include="karma.conf.js" />  
87 - <Content Include="protractor.conf.js" />  
88 <Content Include="src\app\app.component.css" /> 66 <Content Include="src\app\app.component.css" />
89 <Content Include="src\app\app.component.html" /> 67 <Content Include="src\app\app.component.html" />
90 - <Content Include="src\app\components\changeuserid.component.html" />  
91 <Content Include="src\app\components\ChangePassword\changeuserpassword.component.html" /> 68 <Content Include="src\app\components\ChangePassword\changeuserpassword.component.html" />
  69 + <Content Include="src\app\components\changeuserid.component.html" />
  70 + <Content Include="src\app\components\ChangeUserID\changeuserid.component.html" />
  71 + <Content Include="src\app\components\changeuserpassword.component.html" />
  72 + <Content Include="src\app\components\ManageDiscountCode\managediscountcode.component.html" />
92 <Content Include="src\app\components\UpdateProfile\updateuserprofile.component.html" /> 73 <Content Include="src\app\components\UpdateProfile\updateuserprofile.component.html" />
  74 + <Content Include="src\app\components\UserEntity\changeuserid.component.html" />
  75 + <Content Include="src\app\components\UserEntity\changeuserpassword.component.html" />
  76 + <Content Include="src\app\components\UserEntity\updateuserprofile.component.html" />
  77 + <Content Include="src\app\components\UserEntity\users.component.html" />
  78 + <Content Include="src\app\shared\Confirm\confirm.component.html" />
93 <Content Include="src\app\shared\enum.js" /> 79 <Content Include="src\app\shared\enum.js" />
94 <Content Include="src\app\shared\global.js" /> 80 <Content Include="src\app\shared\global.js" />
  81 + <Content Include="src\assets\img\alertmessage.png" />
95 <Content Include="src\assets\img\bg.gif" /> 82 <Content Include="src\assets\img\bg.gif" />
  83 + <Content Include="src\assets\img\calander.png" />
  84 + <Content Include="src\assets\img\close-button.png" />
  85 + <Content Include="src\assets\img\doller.png" />
96 <Content Include="src\assets\img\img1 - Copy.png" /> 86 <Content Include="src\assets\img\img1 - Copy.png" />
97 <Content Include="src\assets\img\img1-white.png" /> 87 <Content Include="src\assets\img\img1-white.png" />
98 <Content Include="src\assets\img\img1.png" /> 88 <Content Include="src\assets\img\img1.png" />
99 <Content Include="src\assets\img\logo-large.png" /> 89 <Content Include="src\assets\img\logo-large.png" />
100 <Content Include="src\assets\img\logo-main.png" /> 90 <Content Include="src\assets\img\logo-main.png" />
  91 + <Content Include="src\assets\img\search.png" />
101 <Content Include="src\assets\scripts\bootstrap-datetimepicker.min.js" /> 92 <Content Include="src\assets\scripts\bootstrap-datetimepicker.min.js" />
102 <Content Include="src\assets\scripts\bootstrap.js" /> 93 <Content Include="src\assets\scripts\bootstrap.js" />
103 <Content Include="src\assets\scripts\fixed_table_rc.js" /> 94 <Content Include="src\assets\scripts\fixed_table_rc.js" />
104 <Content Include="src\assets\scripts\jquery-1.11.3.min.js" /> 95 <Content Include="src\assets\scripts\jquery-1.11.3.min.js" />
105 <Content Include="src\assets\styles\admin-custom.css" /> 96 <Content Include="src\assets\styles\admin-custom.css" />
  97 + <Content Include="src\assets\styles\angular-custom.css" />
106 <Content Include="src\assets\styles\bootstrap-datetimepicker.min.css" /> 98 <Content Include="src\assets\styles\bootstrap-datetimepicker.min.css" />
107 <Content Include="src\assets\styles\bootstrap.css" /> 99 <Content Include="src\assets\styles\bootstrap.css" />
108 <Content Include="src\assets\styles\fixed_table_rc.css" /> 100 <Content Include="src\assets\styles\fixed_table_rc.css" />
@@ -114,6 +106,28 @@ @@ -114,6 +106,28 @@
114 <Content Include="src\favicon.ico" /> 106 <Content Include="src\favicon.ico" />
115 <Content Include="src\index.html" /> 107 <Content Include="src\index.html" />
116 <Content Include="src\styles.css" /> 108 <Content Include="src\styles.css" />
  109 + <Content Include="tsconfig.json" />
  110 + <Content Include="tslint.json" />
  111 + <Content Include="src\app\shared\enum.js.map" />
  112 + <Content Include="src\app\shared\global.js.map" />
  113 + <Content Include="src\assets\.gitkeep" />
  114 + <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.eot" />
  115 + <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.ttf" />
  116 + <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.woff" />
  117 + <Content Include="src\assets\styles\fonts\glyphicons-halflings-regular.woff2" />
  118 + <Content Include="src\tsconfig.app.json" />
  119 + <Content Include="src\tsconfig.spec.json" />
  120 + <None Include="Web.Debug.config">
  121 + <DependentUpon>Web.config</DependentUpon>
  122 + </None>
  123 + <None Include="Web.Release.config">
  124 + <DependentUpon>Web.config</DependentUpon>
  125 + </None>
  126 + </ItemGroup>
  127 + <ItemGroup>
  128 + <Content Include=".gitignore" />
  129 + <Content Include="karma.conf.js" />
  130 + <Content Include="protractor.conf.js" />
117 <Content Include="Web.config" /> 131 <Content Include="Web.config" />
118 </ItemGroup> 132 </ItemGroup>
119 <ItemGroup> 133 <ItemGroup>
@@ -127,16 +141,31 @@ @@ -127,16 +141,31 @@
127 <TypeScriptCompile Include="src\app\app.component.ts" /> 141 <TypeScriptCompile Include="src\app\app.component.ts" />
128 <TypeScriptCompile Include="src\app\app.module.ts" /> 142 <TypeScriptCompile Include="src\app\app.module.ts" />
129 <TypeScriptCompile Include="src\app\app.routing.module.ts" /> 143 <TypeScriptCompile Include="src\app\app.routing.module.ts" />
130 - <TypeScriptCompile Include="src\app\components\changeuserid.component.ts" />  
131 <TypeScriptCompile Include="src\app\components\ChangePassword\changeuserpassword.component.ts" /> 144 <TypeScriptCompile Include="src\app\components\ChangePassword\changeuserpassword.component.ts" />
  145 + <TypeScriptCompile Include="src\app\components\ChangePassword\changeuserpassword.service.ts" />
  146 + <TypeScriptCompile Include="src\app\components\changeuserid.component.ts" />
  147 + <TypeScriptCompile Include="src\app\components\ChangeUserID\changeuserid.component.ts" />
  148 + <TypeScriptCompile Include="src\app\components\ChangeUserID\changeuserid.service.ts" />
  149 + <TypeScriptCompile Include="src\app\components\ChangeUserID\UserInfo.ts" />
  150 + <TypeScriptCompile Include="src\app\components\changeuserpassword.component.ts" />
  151 + <TypeScriptCompile Include="src\app\components\ManageDiscountCode\managediscountcode.component.ts" />
  152 + <TypeScriptCompile Include="src\app\components\ManageDiscountCode\managediscountcode.service.ts" />
132 <TypeScriptCompile Include="src\app\components\UpdateProfile\datamodel.ts" /> 153 <TypeScriptCompile Include="src\app\components\UpdateProfile\datamodel.ts" />
133 <TypeScriptCompile Include="src\app\components\UpdateProfile\updateuserprofile.component.ts" /> 154 <TypeScriptCompile Include="src\app\components\UpdateProfile\updateuserprofile.component.ts" />
134 <TypeScriptCompile Include="src\app\components\UpdateProfile\user.service.ts" /> 155 <TypeScriptCompile Include="src\app\components\UpdateProfile\user.service.ts" />
  156 + <TypeScriptCompile Include="src\app\components\UserEntity\changeuserid.component.ts" />
  157 + <TypeScriptCompile Include="src\app\components\UserEntity\changeuserpassword.component.ts" />
  158 + <TypeScriptCompile Include="src\app\components\UserEntity\datamodel.ts" />
  159 + <TypeScriptCompile Include="src\app\components\UserEntity\updateuserprofile.component.ts" />
  160 + <TypeScriptCompile Include="src\app\components\UserEntity\user.service.ts" />
  161 + <TypeScriptCompile Include="src\app\components\UserEntity\users.component.ts" />
135 <TypeScriptCompile Include="src\app\model\add-user.interface.ts" /> 162 <TypeScriptCompile Include="src\app\model\add-user.interface.ts" />
136 <TypeScriptCompile Include="src\app\model\data-model.ts" /> 163 <TypeScriptCompile Include="src\app\model\data-model.ts" />
137 <TypeScriptCompile Include="src\app\model\db-tables.ts" /> 164 <TypeScriptCompile Include="src\app\model\db-tables.ts" />
138 <TypeScriptCompile Include="src\app\services\application.service.ts" /> 165 <TypeScriptCompile Include="src\app\services\application.service.ts" />
139 <TypeScriptCompile Include="src\app\services\update-user.service.ts" /> 166 <TypeScriptCompile Include="src\app\services\update-user.service.ts" />
  167 + <TypeScriptCompile Include="src\app\shared\Confirm\confirm.component.ts" />
  168 + <TypeScriptCompile Include="src\app\shared\Confirm\confirm.service.ts" />
140 <TypeScriptCompile Include="src\app\shared\enum.ts" /> 169 <TypeScriptCompile Include="src\app\shared\enum.ts" />
141 <TypeScriptCompile Include="src\app\shared\global.ts" /> 170 <TypeScriptCompile Include="src\app\shared\global.ts" />
142 <TypeScriptCompile Include="src\environments\environment.prod.ts" /> 171 <TypeScriptCompile Include="src\environments\environment.prod.ts" />
400-SOURCECODE/AIAHTML5.ADMIN.Web/package.json
  View file @9781198
@@ -22,7 +22,10 @@ @@ -22,7 +22,10 @@
22 "@angular/platform-browser-dynamic": "^4.2.4", 22 "@angular/platform-browser-dynamic": "^4.2.4",
23 "@angular/router": "^4.2.4", 23 "@angular/router": "^4.2.4",
24 "core-js": "^2.4.1", 24 "core-js": "^2.4.1",
25 - "ngx-bootstrap": "^2.0.0-rc.0", 25 + "ng2-bs3-modal": "0.10.4",
  26 + "ng2-datetime-picker": "0.15.1",
  27 + "ng2-modal": "0.0.25",
  28 + "ng2-select2": "1.0.0-beta.10",
26 "rxjs": "^5.4.2", 29 "rxjs": "^5.4.2",
27 "zone.js": "^0.8.14" 30 "zone.js": "^0.8.14"
28 }, 31 },
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.html
  View file @9781198
@@ -33,17 +33,17 @@ @@ -33,17 +33,17 @@
33 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a> 33 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Profile<span class="caret"></span></a>
34 <ul class="dropdown-menu"> 34 <ul class="dropdown-menu">
35 <li><a [routerLink]="['updateuserprofile']">Update Profile</a></li> 35 <li><a [routerLink]="['updateuserprofile']">Update Profile</a></li>
36 - <li><!--<a href="admin-update-profile.html">Update Profile</a>--></li> 36 +
37 <li><a [routerLink]="['changeuserpassword']">Change Password</a></li> 37 <li><a [routerLink]="['changeuserpassword']">Change Password</a></li>
38 - <li><!--<a href="admin-change-password.html">Change Password</a>--></li>  
39 - <!--<li><a [routerLink]="['changeuserid']">Change User ID</a></li>--> 38 +
  39 + <li><a [routerLink]="['changeuserid']">Change User ID</a></li>
40 <li><!--<a href="admin-change-user-id.html">Change User ID</a>--></li> 40 <li><!--<a href="admin-change-user-id.html">Change User ID</a>--></li>
41 </ul> 41 </ul>
42 </li> 42 </li>
43 <li class="dropdown"> 43 <li class="dropdown">
44 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Licenses<span class="caret"></span></a> 44 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Licenses<span class="caret"></span></a>
45 <ul class="dropdown-menu"> 45 <ul class="dropdown-menu">
46 - <li><a href="admin-search-license.html">Search License</a></li> 46 + <li><a [routerlink]="['managediscountcode']">Search License</a></li>
47 <li><a href="admin-add-new-license.html">Add New License</a></li> 47 <li><a href="admin-add-new-license.html">Add New License</a></li>
48 <li><a href="admin-setup-test-account.html">Setup Test Account</a></li> 48 <li><a href="admin-setup-test-account.html">Setup Test Account</a></li>
49 </ul> 49 </ul>
@@ -51,15 +51,14 @@ @@ -51,15 +51,14 @@
51 <li class="dropdown"> 51 <li class="dropdown">
52 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Product Features<span class="caret"></span></a> 52 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Product Features<span class="caret"></span></a>
53 <ul class="dropdown-menu"> 53 <ul class="dropdown-menu">
54 - <li><a [routerLink]="['managediscountcode']">Manage Discount Code</a></li>  
55 - <!--<li><a href="admin-manage-discount-code.html">Manage Discount Code</a></li>--> 54 + <li><a href="admin-manage-discount-code.html">Manage Discount Code</a></li>
56 <li><a href="admin-subscription-price.html">Subscription Price</a></li> 55 <li><a href="admin-subscription-price.html">Subscription Price</a></li>
57 </ul> 56 </ul>
58 </li> 57 </li>
59 <li class="dropdown"> 58 <li class="dropdown">
60 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Users<span class="caret"></span></a> 59 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Users<span class="caret"></span></a>
61 <ul class="dropdown-menu"> 60 <ul class="dropdown-menu">
62 - <li><a href="admin-list-user.html">List User</a></li> 61 + <li><a [routerLink]="['users']">List User</a></li>
63 <li><a href="admin-add-user.html">Add User</a></li> 62 <li><a href="admin-add-user.html">Add User</a></li>
64 <li><a href="admin-Unblock-user.html">Unblock User</a></li> 63 <li><a href="admin-Unblock-user.html">Unblock User</a></li>
65 <li><a href="admin-user-group.html">User Group</a></li> 64 <li><a href="admin-user-group.html">User Group</a></li>
@@ -118,6 +117,22 @@ @@ -118,6 +117,22 @@
118 117
119 <!-- navigation --> 118 <!-- navigation -->
120 <div class="clearfix"></div> 119 <div class="clearfix"></div>
  120 +<div class="row">
  121 + <router-outlet>
  122 + <modal-confirm></modal-confirm>
  123 + </router-outlet>
  124 + <!-- main-heading -->
  125 + <!--<div class="col-sm-12 pageHeading">
  126 + <h4>Update Profile</h4>
  127 + </div>-->
  128 + <!-- main-heading -->
  129 + <!-- container -->
  130 + <!--<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
  131 + <div class="container-fluid main-full">-->
  132 + <!-- html of other components -->
121 133
122 - <router-outlet></router-outlet>  
123 - 134 +
  135 + <!--</div>
  136 + </div>-->
  137 + <!-- container -->
  138 +</div>
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts
  View file @9781198
1 -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';  
2 -import { UserService } from './components/UpdateProfile/user.service';  
3 -import { ChangeUserPasswordService } from './components/ChangePassword/changeuserpassword.service'; 1 +import { Component, OnInit } from '@angular/core';
  2 +import { UserService } from './components/UserEntity/user.service';
4 import { ManageDiscountCodeService } from './components/ManageDiscountCode/managediscountcode.service'; 3 import { ManageDiscountCodeService } from './components/ManageDiscountCode/managediscountcode.service';
5 -  
6 @Component({ 4 @Component({
7 selector: 'app-component', 5 selector: 'app-component',
8 templateUrl: '../app/app.component.html', 6 templateUrl: '../app/app.component.html',
9 - providers: [UserService, ChangeUserPasswordService, ManageDiscountCodeService] 7 + providers: [UserService, ManageDiscountCodeService]
10 }) 8 })
11 9
12 export class AppComponent implements OnInit { 10 export class AppComponent implements OnInit {
13 11
14 - constructor(private userservice: UserService) { } 12 + constructor(private userservice: UserService, private managediscountservice: ManageDiscountCodeService) { }
15 13
16 - ngOnInit(): void { } 14 + ngOnInit(): void { }
17 15
18 } 16 }
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts
  View file @9781198
  1 +
1 2
2 import { FormsModule, ReactiveFormsModule } from '@angular/forms'; 3 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
3 import { BrowserModule } from '@angular/platform-browser'; 4 import { BrowserModule } from '@angular/platform-browser';
@@ -6,31 +7,33 @@ import { RouterModule, Routes } from &#39;@angular/router&#39;; @@ -6,31 +7,33 @@ import { RouterModule, Routes } from &#39;@angular/router&#39;;
6 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; 7 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
7 import { APP_BASE_HREF } from '@angular/common'; 8 import { APP_BASE_HREF } from '@angular/common';
8 import { HttpModule } from '@angular/http'; 9 import { HttpModule } from '@angular/http';
  10 +import { Ng2Bs3ModalModule } from 'ng2-bs3-modal/ng2-bs3-modal';
9 11
10 //import { ModalModule } from 'ngx-bootstrap/modal'; 12 //import { ModalModule } from 'ngx-bootstrap/modal';
11 -import { UpdateUserProfile } from './components/UpdateProfile/updateuserprofile.component';  
12 -import { ChangeUserPassword } from './components/ChangePassword/changeuserpassword.component'; 13 +import { UpdateUserProfile } from './components/UserEntity/updateuserprofile.component';
  14 +import { ChangeUserPassword } from './components/UserEntity/changeuserpassword.component';
  15 +import { ChangeUserID } from './components/UserEntity/changeuserid.component';
  16 +import { UsersList } from './components/UserEntity/users.component';
13 import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component'; 17 import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component';
14 -import { ChangeUserId } from './components/changeuserid.component';  
15 import { AppComponent } from './app.component'; 18 import { AppComponent } from './app.component';
16 import { AppRoutingModule } from './app.routing.module'; 19 import { AppRoutingModule } from './app.routing.module';
17 //import { AuthGuard } from '../app/authguard.service'; 20 //import { AuthGuard } from '../app/authguard.service';
18 //import { AuthService } from '../app/auth.service'; 21 //import { AuthService } from '../app/auth.service';
19 //import { MyInterceptor } from '../app/token.interceptor'; 22 //import { MyInterceptor } from '../app/token.interceptor';
20 -import { BsDatepickerModule } from 'ngx-bootstrap';  
21 import { GlobalService } from './Shared/global'; 23 import { GlobalService } from './Shared/global';
22 - 24 +import { ConfirmService } from './Shared/Confirm/confirm.service';
  25 +import { ConfirmComponent } from "./Shared/Confirm/confirm.component"
23 @NgModule({ 26 @NgModule({
24 declarations: [ 27 declarations: [
25 - ChangeUserPassword, ChangeUserId,  
26 - UpdateUserProfile, ManageDiscountCode,  
27 - AppComponent 28 + ChangeUserPassword, ChangeUserID,
  29 + UpdateUserProfile, UsersList,
  30 + ManageDiscountCode,
  31 + AppComponent, ConfirmComponent
28 ], 32 ],
29 imports: [ 33 imports: [
30 - BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule,  
31 - BsDatepickerModule.forRoot() //ModalModule.forRoot() 34 + BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule, Ng2Bs3ModalModule //ModalModule.forRoot()
32 ], 35 ],
33 - providers: [ 36 + providers: [GlobalService, ConfirmService,
34 //AuthService, 37 //AuthService,
35 //AuthGuard, 38 //AuthGuard,
36 //{ 39 //{
@@ -39,7 +42,7 @@ import { GlobalService } from &#39;./Shared/global&#39;; @@ -39,7 +42,7 @@ import { GlobalService } from &#39;./Shared/global&#39;;
39 // multi: true 42 // multi: true
40 //} 43 //}
41 { provide: APP_BASE_HREF, useValue: '/' } 44 { provide: APP_BASE_HREF, useValue: '/' }
42 - , GlobalService 45 +
43 ], 46 ],
44 bootstrap: [AppComponent] 47 bootstrap: [AppComponent]
45 }) 48 })
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts
  View file @9781198
1 import { NgModule } from '@angular/core'; 1 import { NgModule } from '@angular/core';
2 import { RouterModule, Routes } from '@angular/router'; 2 import { RouterModule, Routes } from '@angular/router';
3 -import { UpdateUserProfile } from './components/UpdateProfile/updateuserprofile.component';  
4 -import { ChangeUserPassword } from './components/ChangePassword/changeuserpassword.component';  
5 -import { ChangeUserId } from './components/changeuserid.component'; 3 +import { UpdateUserProfile } from './components/UserEntity/updateuserprofile.component';
  4 +import { ChangeUserPassword } from './components/UserEntity/changeuserpassword.component';
  5 +import { ChangeUserID } from './components/UserEntity/changeuserid.component';
  6 +import { UsersList } from './components/UserEntity/users.component';
6 import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component'; 7 import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component';
7 //import { AuthGuard } from './authguard.service'; 8 //import { AuthGuard } from './authguard.service';
8 9
@@ -10,7 +11,8 @@ const appRoutes: Routes = [ @@ -10,7 +11,8 @@ const appRoutes: Routes = [
10 //{ path: '', redirectTo:'updateuserprofile',pathMatch } 11 //{ path: '', redirectTo:'updateuserprofile',pathMatch }
11 { path: 'updateuserprofile', component: UpdateUserProfile }, 12 { path: 'updateuserprofile', component: UpdateUserProfile },
12 { path: 'changeuserpassword', component: ChangeUserPassword }, 13 { path: 'changeuserpassword', component: ChangeUserPassword },
13 - { path: 'changeuserid', component: ChangeUserId }, 14 + { path: 'changeuserid', component: ChangeUserID },
  15 + { path: 'users', component: UsersList },
14 { path: 'managediscountcode', component: ManageDiscountCode }, 16 { path: 'managediscountcode', component: ManageDiscountCode },
15 ]; 17 ];
16 18
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.html
  View file @9781198
1 <div class="row"> 1 <div class="row">
2 - <!-- main-heading -->  
3 - <div class="col-sm-12 pageHeading">  
4 - <h4>Change User Password</h4>  
5 - </div>  
6 - <!-- main-heading -->  
7 - <!-- container -->  
8 -<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3"> 2 + <!-- main-heading -->
  3 + <div class="col-sm-12 pageHeading">
  4 + <h4>Change User Password</h4>
  5 + </div>
  6 + <!-- main-heading -->
  7 + <!-- container -->
  8 + <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
9 <div class="container-fluid main-full"> 9 <div class="container-fluid main-full">
10 -<div class="row">  
11 - <div class="well">  
12 - <div class="row">  
13 - <div class="col-sm-12">  
14 - <h5 class="text-center text-success"><strong>**To change your profile fill all the text fields carefully.</strong></h5>  
15 - <div class="panel-body">  
16 - <!-- form -->  
17 - <form class="form-horizontal" [formGroup]="changeUserPasswordFrm" (submit)="onFormSubmit()">  
18 - <div class="form-group" *ngIf="alerts != ''">  
19 - <div class="col-xs-12">  
20 - <div class="alert alert-danger" [innerHTML]="alerts">  
21 - </div>  
22 - </div>  
23 - </div>  
24 - <div class="form-group">  
25 - <label for="inputEmail3" class="col-sm-4 control-label">User Id <span class="red">*</span> :</label>  
26 - <div class="col-sm-7">  
27 - <input type="hidden" class="form-control" formControlName="userId" placeholder="">  
28 - <label type="text" class="form-control">{{changeUserPasswordFrm.controls.loginId.value}}</label>  
29 - </div>  
30 - </div>  
31 - <div class="form-group">  
32 - <label for="inputPassword3" class="col-sm-4 control-label">Old Password <span class="red">*</span> :</label>  
33 - <div class="col-sm-7">  
34 - <input type="password" class="form-control" formControlName="oldPassword" placeholder="" maxlength="50">  
35 - <div *ngIf="!changeUserPasswordFrm.controls.oldPassword.valid && changeUserPasswordFrm.controls.oldPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Old password is required</div>  
36 - </div>  
37 - </div>  
38 - <div class="form-group">  
39 - <label for="inputPassword3" class="col-sm-4 control-label">New Password <span class="red">*</span> :</label>  
40 - <div class="col-sm-7">  
41 - <input type="password" class="form-control" formControlName="newPassword" placeholder="" maxlength="50">  
42 - <span class="help-block">(Minimum 8 characters)</span>  
43 - <div *ngIf="!changeUserPasswordFrm.controls.newPassword.valid && changeUserPasswordFrm.controls.newPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">New password of minimum 8 characters is required</div>  
44 - </div>  
45 - </div>  
46 - <div class="form-group">  
47 - <label for="inputPassword3" class="col-sm-4 control-label">Confirm Password <span class="red">*</span> :</label>  
48 - <div class="col-sm-7">  
49 - <input type="password" class="form-control" formControlName="confirmPassword" placeholder="" maxlength="50">  
50 - <div *ngIf="!changeUserPasswordFrm.controls.confirmPassword.valid && changeUserPasswordFrm.controls.confirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm password is required</div>  
51 - </div>  
52 - </div>  
53 - <div class="form-group">  
54 - <div class="col-sm-offset-4 col-sm-7 mar-top17">  
55 - <button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-check"></i> Update</button>  
56 - <button type="button" class="btn btn-primary btn-sm" (click)="ResetFormFields()"><i class="fa fa-close"></i> Cancel</button>  
57 - </div>  
58 - </div>  
59 - <!--cancel-button-->  
60 - <div class="modal fade bs-example-modal-sm ui-draggable" tabindex="-1" role="dialog" id="mymodal">  
61 - <div class="modal-dialog modal-sm" role="document">  
62 - <div class="modal-content">  
63 - <div class="modal-header annotation-modal-header ui-draggable-handle">  
64 - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">ร—</span></button>  
65 - <h4 class="modal-title" id="">Alert</h4> 10 +
  11 + <div class="row">
  12 + <div class="well">
  13 + <div class="row">
  14 + <div class="col-sm-12">
  15 + <h5 class="text-center text-success"><strong>**To change your profile fill all the text fields carefully.</strong></h5>
  16 + <div class="panel-body">
  17 + <!-- form -->
  18 + <form class="form-horizontal" [formGroup]="changeUserPasswordFrm" (submit)="onFormSubmit()">
  19 + <div class="form-group" *ngIf="alerts !== ''">
  20 + <div class="col-xs-12">
  21 + <div class="alert alert-danger" [innerHTML]="alerts">
  22 + </div>
  23 + </div>
  24 + </div>
  25 + <div class="form-group">
  26 + <label for="inputEmail3" class="col-sm-4 control-label">User Id <span class="red">*</span> :</label>
  27 + <div class="col-sm-7">
  28 + <label type="text" class="form-control" formControlName="loginId" placeholder="Superadmin">{{changeUserPasswordFrm.controls.loginId.value}}</label>
  29 + </div>
  30 + </div>
  31 + <div class="form-group">
  32 + <label for="inputPassword3" class="col-sm-4 control-label">Old Password <span class="red">*</span> :</label>
  33 + <div class="col-sm-7">
  34 + <input type="password" class="form-control" formControlName="oldPassword" placeholder="">
  35 + <div *ngIf="!changeUserPasswordFrm.controls.oldPassword.valid && changeUserPasswordFrm.controls.oldPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Old password is required</div>
  36 + </div>
  37 + </div>
  38 + <div class="form-group">
  39 + <label for="inputPassword3" class="col-sm-4 control-label">New Password <span class="red">*</span> :</label>
  40 + <div class="col-sm-7">
  41 + <input type="password" class="form-control" formControlName="newPassword" placeholder="">
  42 + <span class="help-block">(Minimum 8 characters)</span>
  43 + <div *ngIf="!changeUserPasswordFrm.controls.newPassword.valid && changeUserPasswordFrm.controls.newPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">New password of minimum 8 characters is required</div>
  44 + </div>
66 </div> 45 </div>
67 - <div class="modal-body">  
68 - <h5>Please enter your old password</h5> 46 + <div class="form-group">
  47 + <label for="inputPassword3" class="col-sm-4 control-label">Confirm Password <span class="red">*</span> :</label>
  48 + <div class="col-sm-7">
  49 + <input type="password" class="form-control" formControlName="confirmPassword" placeholder="">
  50 + <div *ngIf="!changeUserPasswordFrm.controls.confirmPassword.valid && changeUserPasswordFrm.controls.confirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm password is required</div>
  51 + </div>
69 </div> 52 </div>
70 - <div class="modal-footer">  
71 - <div class="row">  
72 - <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div> 53 + <div class="form-group">
  54 + <div class="col-sm-offset-4 col-sm-7 mar-top17">
  55 + <button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-check"></i> Update</button>
  56 + <button type="button" class="btn btn-primary btn-sm" (click)="ResetFormFields()"><i class="fa fa-close"></i> Cancel</button>
73 </div> 57 </div>
74 </div> 58 </div>
  59 + <!--cancel-button-->
  60 + <div class="modal fade bs-example-modal-sm ui-draggable" tabindex="-1" role="dialog" id="mymodal">
  61 + <div class="modal-dialog modal-sm" role="document">
  62 + <div class="modal-content">
  63 + <div class="modal-header annotation-modal-header ui-draggable-handle">
  64 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">ร—</span></button>
  65 + <h4 class="modal-title" id="">Alert</h4>
  66 + </div>
  67 + <div class="modal-body">
  68 + <h5>Please enter your old password</h5>
  69 + </div>
  70 + <div class="modal-footer">
  71 + <div class="row">
  72 + <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>
  73 + </div>
  74 + </div>
75 75
76 - </div><!-- /.modal-content -->  
77 - </div><!-- /.modal-dialog -->  
78 - </div><!-- /.modal -->  
79 - <!--cancel-button-->  
80 - </form>  
81 - <!-- form --> 76 + </div><!-- /.modal-content -->
  77 + </div><!-- /.modal-dialog -->
  78 + </div><!-- /.modal -->
  79 + <!--cancel-button-->
  80 + </form>
  81 + <!-- form -->
  82 + </div>
  83 + </div>
  84 + </div>
82 </div> 85 </div>
83 </div> 86 </div>
84 </div> 87 </div>
85 </div> 88 </div>
  89 +
  90 +
86 </div> 91 </div>
87 -</div>  
88 -</div>  
89 -  
90 - <!-- container -->  
91 -</div>  
92 \ No newline at end of file 92 \ No newline at end of file
  93 +
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.ts
  View file @9781198
@@ -4,7 +4,6 @@ import { Router } from &#39;@angular/router&#39;; @@ -4,7 +4,6 @@ import { Router } from &#39;@angular/router&#39;;
4 import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; 4 import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
5 import { User } from '../UpdateProfile/datamodel'; 5 import { User } from '../UpdateProfile/datamodel';
6 import { Http, Response } from '@angular/http'; 6 import { Http, Response } from '@angular/http';
7 -  
8 //import { Global } from '../../Shared/global'; 7 //import { Global } from '../../Shared/global';
9 //import { DBOperation } from 'S'; 8 //import { DBOperation } from 'S';
10 //import { Observable } from 'rxjs/Observable'; 9 //import { Observable } from 'rxjs/Observable';
@@ -26,7 +25,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat @@ -26,7 +25,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat
26 this.user = new User(); 25 this.user = new User();
27 this.alerts = ''; 26 this.alerts = '';
28 this.changeUserPasswordFrm = this.fb.group({ 27 this.changeUserPasswordFrm = this.fb.group({
29 - userId: [''],  
30 loginId: ['', Validators.required], 28 loginId: ['', Validators.required],
31 oldPassword: ['', Validators.required], 29 oldPassword: ['', Validators.required],
32 newPassword: ['', [Validators.required, Validators.minLength(8)]], 30 newPassword: ['', [Validators.required, Validators.minLength(8)]],
@@ -41,18 +39,15 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat @@ -41,18 +39,15 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat
41 } 39 }
42 40
43 public onFormSubmit() { 41 public onFormSubmit() {
44 - this.alerts = '';  
45 if(this.user.Password != this.changeUserPasswordFrm.value.oldPassword){ 42 if(this.user.Password != this.changeUserPasswordFrm.value.oldPassword){
46 this.alerts = '<span>Old password is invalid</span>'; 43 this.alerts = '<span>Old password is invalid</span>';
47 } 44 }
48 - if(this.user.Password == this.changeUserPasswordFrm.value.newPassword){  
49 - this.alerts += '</br><span>New password and old password must be different</span>';  
50 - }  
51 if(this.changeUserPasswordFrm.value.newPassword != this.changeUserPasswordFrm.value.confirmPassword){ 45 if(this.changeUserPasswordFrm.value.newPassword != this.changeUserPasswordFrm.value.confirmPassword){
52 this.alerts += '</br><span>New password and confirm password must be same</span>'; 46 this.alerts += '</br><span>New password and confirm password must be same</span>';
53 } 47 }
54 - if(this.alerts == ''){  
55 - var obj = this.changeUserPasswordFrm.value; 48 + if(this.alerts != ''){
  49 + this.user = this.changeUserPasswordFrm.value;
  50 + var obj = this.user
56 return this.changeUserPasswordService.ChangeUserPassword(obj) 51 return this.changeUserPasswordService.ChangeUserPassword(obj)
57 .subscribe( 52 .subscribe(
58 n => (this.AfterInsertData(n)), 53 n => (this.AfterInsertData(n)),
@@ -70,7 +65,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat @@ -70,7 +65,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat
70 65
71 BindFormFields(data){ 66 BindFormFields(data){
72 this.user = data[0]; 67 this.user = data[0];
73 - this.changeUserPasswordFrm.controls['userId'].setValue(this.user.Id);  
74 this.changeUserPasswordFrm.controls['loginId'].setValue(this.user.LoginId); 68 this.changeUserPasswordFrm.controls['loginId'].setValue(this.user.LoginId);
75 } 69 }
76 70
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.service.ts
  View file @9781198
@@ -38,18 +38,12 @@ export class ChangeUserPasswordService { @@ -38,18 +38,12 @@ export class ChangeUserPasswordService {
38 GetUserById() { 38 GetUserById() {
39 return this.http.get(this.commonService.resourceBaseUrl + "/api/GetUserProfile/1") 39 return this.http.get(this.commonService.resourceBaseUrl + "/api/GetUserProfile/1")
40 .map(this.extractData) 40 .map(this.extractData)
41 - .catch((res: Response) => this.handleError(res)); 41 + .catch((res: Response) => this.handleError(res));;
42 } 42 }
43 43
44 - ChangeUserPassword(obj: any) { 44 + ChangeUserPassword(obj: User) {
45 //let options = new RequestOptions({ headers: this.headers }); 45 //let options = new RequestOptions({ headers: this.headers });
46 - var jsonData = {'id': obj.userId, 'newPassword': obj.newPassword };  
47 - console.log(obj);  
48 - var headers = new Headers({  
49 - 'Content-Type': 'application/json'  
50 - });  
51 - return this.http.post(this.commonService.resourceBaseUrl + "/api/ChangeUserPassword",  
52 - JSON.stringify(jsonData), {headers: headers}) 46 + return this.http.post(this.commonService.resourceBaseUrl + "/api/ChangeUserPassword", obj)
53 .map(this.extractData) 47 .map(this.extractData)
54 .catch((res: Response) => this.handleError(res)); 48 .catch((res: Response) => this.handleError(res));
55 } 49 }
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode.zip deleted
View file @07ec029
No preview for this file type
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts
  View file @9781198
@@ -2,8 +2,8 @@ import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter } from &#39;@ @@ -2,8 +2,8 @@ import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter } from &#39;@
2 import { ManageDiscountCodeService } from './managediscountcode.service'; 2 import { ManageDiscountCodeService } from './managediscountcode.service';
3 import { Router } from '@angular/router'; 3 import { Router } from '@angular/router';
4 import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; 4 import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
5 -import { DiscountCode } from '../UpdateProfile/datamodel';  
6 -import { BsDatepickerModule } from 'ngx-bootstrap'; 5 +import { DiscountCode } from '../UserEntity/datamodel';
  6 +//import { BsDatepickerModule } from 'ngx-bootstrap';
7 import { Http, Response } from '@angular/http'; 7 import { Http, Response } from '@angular/http';
8 8
9 //import { Global } from '../../Shared/global'; 9 //import { Global } from '../../Shared/global';
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts
  View file @9781198
1 export class User { 1 export class User {
  2 + LoginId: string;
  3 + Password: string;
2 Id: number; 4 Id: number;
3 FirstName: string; 5 FirstName: string;
4 LastName: string; 6 LastName: string;
5 EmailId: string; 7 EmailId: string;
6 - LoginId: string;  
7 - Password: string;  
8 - SecurityQuestionId: number;  
9 - SecurityAnswer: string;  
10 - CreatorId: number;  
11 - CreationDate: Date;  
12 - DeactivationDate: Date;  
13 - ModifierId: number;  
14 - ModifiedDate: Date;  
15 - UserTypeId: number;  
16 - IsActive: boolean;  
17 } 8 }
18 -  
19 -export class DiscountCode {  
20 - Id: number;  
21 - DiscountCode: string;  
22 - StartDate: Date;  
23 - EndDate: Date;  
24 - Percentage: DoubleRange;  
25 - IsActive: boolean;  
26 -}  
27 -  
28 //export class User { 9 //export class User {
29 // userId: number; 10 // userId: number;
30 // firstName: string; 11 // firstName: string;
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.html
  View file @9781198
1 <div class="row"> 1 <div class="row">
2 - <!-- main-heading -->  
3 - <div class="col-sm-12 pageHeading">  
4 - <h4>Update User Profile</h4>  
5 - </div>  
6 - <!-- main-heading -->  
7 - <!-- container -->  
8 -<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3"> 2 + <!-- main-heading -->
  3 + <div class="col-sm-12 pageHeading">
  4 + <h4>Update Profile</h4>
  5 + </div>
  6 + <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
9 <div class="container-fluid main-full"> 7 <div class="container-fluid main-full">
10 -<div class="row">  
11 - <div class="well">  
12 - <div class="row">  
13 - <div class="col-sm-12">  
14 - <h5 class="text-center text-success"><strong>**To update your profile fill all the text fields carefully.</strong></h5>  
15 - <div class="panel-body">  
16 - <!-- form -->  
17 - <form class="form-horizontal" novalidate (ngSubmit)="UpdateUserProfile(this)" [formGroup]="userFrm">  
18 - <div class="form-group">  
19 -  
20 - <label for="inputEmail3" class="col-sm-4 control-label">First Name <span class="red">*</span> :</label>  
21 - <div class="col-sm-7">  
22 - <input type="text" formControlName="firstName" class="form-control" id="inputEmail3">  
23 - </div>  
24 - </div>  
25 - <div class="form-group">  
26 - <label for="inputPassword3" class="col-sm-4 control-label">Last Name <span class="red">*</span> :</label>  
27 - <div class="col-sm-7">  
28 - <input type="text" class="form-control" id="inputPassword3" formControlName="lastName">  
29 - </div>  
30 - </div>  
31 - <div class="form-group">  
32 - <label for="inputPassword3" class="col-sm-4 control-label">Email Id <span class="red">*</span> :</label>  
33 - <div class="col-sm-7">  
34 - <input type="text" class="form-control" id="inputPassword3" formControlName="emailId">  
35 - </div>  
36 - </div>  
37 - <div class="form-group">  
38 - <div class="col-sm-offset-4 col-sm-7 mar-top17">  
39 - <button type="submit" class="btn btn-primary btn-sm" data-toggle="modal" (click)="UpdateUserProfile(this)"><i class="fa fa-check"></i> Update</button>  
40 - <!--cancel-button-->  
41 -  
42 - <div class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" id="mymodal">  
43 - <div class="modal-dialog modal-sm" role="document">  
44 - <div class="modal-content">  
45 - <div class="modal-header annotation-modal-header ui-draggable-handle">  
46 - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">ร—</span></button>  
47 - <h4 class="modal-title" id="">Alert</h4> 8 + <div class="row">
  9 + <div class="well">
  10 + <div class="row">
  11 + <div class="col-sm-12">
  12 + <h5 class="text-center text-success"><strong>**To update your profile fill all the text fields carefully.</strong></h5>
  13 + <div class="panel-body">
  14 + <!-- form -->
  15 + <form class="form-horizontal" novalidate [formGroup]="userFrm">
  16 + <div class="form-group" *ngIf="alerts !== ''">
  17 + <div class="col-xs-12">
  18 + <div class="alert alert-danger" [innerHTML]="alerts">
48 </div> 19 </div>
49 - <div class="modal-body">  
50 - <h5>User profile has been updated successfully.</h5>  
51 - </div>  
52 - <div class="modal-footer">  
53 - <div class="row">  
54 - <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>  
55 - </div> 20 + </div>
  21 + </div>
  22 + <div class="form-group">
  23 +
  24 + <label for="inputEmail3" class="col-sm-4 control-label">First Name <span class="red">*</span> :</label>
  25 + <div class="col-sm-7">
  26 + <input type="text" formControlName="firstName" class="form-control" id="inputEmail3">
  27 + <div *ngIf="!userFrm.controls.firstName.valid && userFrm.controls.firstName.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">First name is required</div>
  28 + </div>
  29 + </div>
  30 + <div class="form-group">
  31 + <label for="inputPassword3" class="col-sm-4 control-label">Last Name <span class="red">*</span> :</label>
  32 + <div class="col-sm-7">
  33 + <input type="text" class="form-control" id="inputPassword3" formControlName="lastName">
  34 + <div *ngIf="!userFrm.controls.lastName.valid && userFrm.controls.lastName.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Last name is required</div>
  35 + </div>
  36 + </div>
  37 + <div class="form-group">
  38 + <label for="inputPassword3" class="col-sm-4 control-label">Email Id <span class="red">*</span> :</label>
  39 + <div class="col-sm-7">
  40 + <input type="text" class="form-control" required="required" id="inputPassword3" formControlName="emailId" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,3}$">
  41 +
  42 + <div *ngIf="userFrm.controls.emailId.invalid && !userFrm.controls.emailId.value" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Email id is required</div>
  43 +
  44 + <div *ngIf="userFrm.controls.emailId.invalid && userFrm.controls.emailId.value" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">
  45 + Please enter the correct email.
56 </div> 46 </div>
  47 + </div>
  48 + </div>
  49 + <div class="form-group">
  50 + <div class="col-sm-offset-4 col-sm-7 mar-top17">
  51 + <button type="submit" class="btn btn-primary btn-sm" data-toggle="modal" (click)="UpdateUserProfile(this)"><i class="fa fa-check"></i> Update</button>
  52 + <!--cancel-button-->
57 53
58 - </div><!-- /.modal-content -->  
59 - </div><!-- /.modal-dialog -->  
60 - </div><!-- /.modal -->  
61 - <!--cancel-button-->  
62 - <button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-close"></i> Cancel</button>  
63 - </div> 54 + <div class="modal fade bs-example-modal-sm" tabindex="-1" #profileModal role="dialog" id="mymodal">
  55 + <div class="modal-dialog modal-sm" role="document">
  56 + <div class="modal-content">
  57 + <div class="modal-header annotation-modal-header ui-draggable-handle">
  58 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">ร—</span></button>
  59 + <h4 class="modal-title" id="">Alert</h4>
  60 + </div>
  61 + <div class="modal-body">
  62 + <h5>User profile has been updated successfully.</h5>
  63 + </div>
  64 + <div class="modal-footer">
  65 + <div class="row">
  66 + <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>
  67 + </div>
  68 + </div>
64 69
  70 + </div><!-- /.modal-content -->
  71 + </div><!-- /.modal-dialog -->
  72 + </div><!-- /.modal -->
  73 + <!--cancel-button-->
  74 + <button type="submit" class="btn btn-primary btn-sm" (click)="GetUserById()"><i class="fa fa-close"></i> Cancel</button>
  75 + </div>
  76 +
  77 + </div>
  78 + </form>
  79 + <!-- form -->
  80 + </div>
65 </div> 81 </div>
66 - </form>  
67 - <!-- form --> 82 + </div>
68 </div> 83 </div>
69 </div> 84 </div>
70 </div> 85 </div>
71 </div> 86 </div>
72 </div> 87 </div>
73 -</div>  
74 -</div>  
75 -<!-- container -->  
76 -</div>  
77 \ No newline at end of file 88 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.ts
  View file @9781198
1 -import { Component, OnInit, AfterViewInit } from '@angular/core'; 1 +import { Component, OnInit, AfterViewInit,ViewChild } from '@angular/core';
2 import { UserService } from '../UpdateProfile/user.service'; 2 import { UserService } from '../UpdateProfile/user.service';
3 import { Router } from '@angular/router'; 3 import { Router } from '@angular/router';
4 -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; 4 +import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
  5 +import { FormsModule, ReactiveFormsModule } from '@angular/forms';
5 import { User } from '../UpdateProfile/datamodel'; 6 import { User } from '../UpdateProfile/datamodel';
6 import { Http, Response } from '@angular/http'; 7 import { Http, Response } from '@angular/http';
7 //import { Global } from '../../Shared/global'; 8 //import { Global } from '../../Shared/global';
8 //import { DBOperation } from 'S'; 9 //import { DBOperation } from 'S';
9 -//import { Observable } from 'rxjs/Observable';  
10 - 10 +import { Observable } from 'rxjs/Observable';
  11 +import { ConfirmService } from '../../Shared/Confirm/confirm.service';
  12 +import 'rxjs/Rx';
  13 +import 'rxjs/add/operator/map';
  14 +import 'rxjs/add/operator/filter';
  15 +
11 16
12 @Component({ 17 @Component({
13 templateUrl:'./updateuserprofile.component.html' // '../../../../../wwwroot/html/UpdateProfile/updateuserprofile.component.html' 18 templateUrl:'./updateuserprofile.component.html' // '../../../../../wwwroot/html/UpdateProfile/updateuserprofile.component.html'
@@ -27,13 +32,18 @@ export class UpdateUserProfile implements OnInit { @@ -27,13 +32,18 @@ export class UpdateUserProfile implements OnInit {
27 useFname: string; 32 useFname: string;
28 error; 33 error;
29 status: boolean; 34 status: boolean;
  35 + alerts: string;
  36 + emailPattern = "^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$";
  37 + //@ViewChild("profileModal")
  38 + //profileModal: ModalComponent;
30 //errorMessage: any; 39 //errorMessage: any;
31 -  
32 - constructor(private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http) { } 40 + constructor(private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http,
  41 + private _confirmService: ConfirmService
  42 + ) { }
33 43
34 ngOnInit(): void { 44 ngOnInit(): void {
35 this.user = new User(); 45 this.user = new User();
36 - 46 + this.alerts = '';
37 //this.userservice.GetUserById(this.UserId); 47 //this.userservice.GetUserById(this.UserId);
38 this.userFrm = this.fb.group({ 48 this.userFrm = this.fb.group({
39 id: [''], 49 id: [''],
@@ -68,15 +78,17 @@ export class UpdateUserProfile implements OnInit { @@ -68,15 +78,17 @@ export class UpdateUserProfile implements OnInit {
68 .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = <any>error); 78 .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = <any>error);
69 } 79 }
70 UpdateUserProfile(this) { 80 UpdateUserProfile(this) {
71 - debugger; 81 + // debugger;
72 this.user = this.userFrm.value; 82 this.user = this.userFrm.value;
  83 + //if(this.user.)
73 console.log(this.user); 84 console.log(this.user);
74 var obj = this.user 85 var obj = this.user
75 - return this.userservice.UpdateUserProfileById(obj)  
76 - .subscribe(  
77 - n => (this.AfterInsertData(n)),  
78 - error => this.error = <any>error);  
79 - 86 + if (this.userFrm.valid) {
  87 + return this.userservice.UpdateUserProfileById(obj)
  88 + .subscribe(
  89 + n => (this.AfterInsertData(n)),
  90 + error => this.error = <any>error);
  91 + }
80 } 92 }
81 AfterInsertData(data) { 93 AfterInsertData(data) {
82 //debugger; 94 //debugger;
@@ -87,6 +99,10 @@ export class UpdateUserProfile implements OnInit { @@ -87,6 +99,10 @@ export class UpdateUserProfile implements OnInit {
87 return false; 99 return false;
88 } else { 100 } else {
89 this.status = true; 101 this.status = true;
  102 + debugger;
  103 +
  104 + this._confirmService.activate("User Profile Updated Successfully.", "alertMsg");
  105 + //this.profileModal.open();
90 // this.submitted = false; 106 // this.submitted = false;
91 // this.GetAllAcctMgr(); 107 // this.GetAllAcctMgr();
92 // this.DisableAllControls(); 108 // this.DisableAllControls();
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/user.service.ts
  View file @9781198
@@ -11,28 +11,7 @@ import { GlobalService } from &#39;../../Shared/global&#39;; @@ -11,28 +11,7 @@ import { GlobalService } from &#39;../../Shared/global&#39;;
11 @Injectable() 11 @Injectable()
12 export class UserService { 12 export class UserService {
13 13
14 - constructor(private _http: Http, private http: Http, private commonService: GlobalService ) { }  
15 - //constructor() { }  
16 - //public GetUserById(Id: any): Observable<User> {  
17 - // return this.http.request<User>(  
18 - // 'GET',  
19 - // 'http://192.168.86.13:92/API/Api/Users/' + Id);  
20 - //}  
21 -  
22 - //GetUserByLoginIdPassword(LoginId: string, Password: string): Observable<User> {  
23 - // return this.http.request<User>(  
24 - // 'GET',  
25 - // 'http://192.168.86.13:92/API/Api/Users/{LoginId=' + LoginId + '&Password=' + Password + '}');  
26 - //}  
27 -  
28 - //UpdateProfile(UserObj: User): Observable<any> {  
29 - // return this.http.request<any>(  
30 - // 'POST',  
31 - // 'http://192.168.86.13:92/API/Api/Users/UpdateProfile',  
32 - // {  
33 - // body: UserObj  
34 - // });  
35 - //} 14 + constructor(private http: Http, private commonService: GlobalService ) { }
36 15
37 GetUserById() { 16 GetUserById() {
38 17
@@ -43,7 +22,7 @@ export class UserService { @@ -43,7 +22,7 @@ export class UserService {
43 } 22 }
44 UpdateUserProfileById(obj: User) { 23 UpdateUserProfileById(obj: User) {
45 //let options = new RequestOptions({ headers: this.headers }); 24 //let options = new RequestOptions({ headers: this.headers });
46 - return this._http.post(this.commonService.resourceBaseUrl + "/api/UpdateProfile", obj) 25 + return this.http.post(this.commonService.resourceBaseUrl + "/api/UpdateProfile", obj)
47 .map(this.extractData) 26 .map(this.extractData)
48 .catch((res: Response) => this.handleError(res)); 27 .catch((res: Response) => this.handleError(res));
49 } 28 }
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/services/shareddataservice.ts deleted
View file @07ec029
1 -๏ปฟimport { Injectable } from '@angular/core';  
2 -import { Http, Response, Headers, RequestOptions, URLSearchParams } from '@angular/http';  
3 -import { Router } from '@angular/router';  
4 -  
5 -import { Observable } from 'rxjs/Observable';  
6 -import 'rxjs/add/operator/map';  
7 -import 'rxjs/add/operator/catch';  
8 -  
9 -@Injectable()  
10 -export class SharedDataService {  
11 -  
12 - className: string = '';  
13 -  
14 - setClassName(newValue) {  
15 - this.className = newValue; //you can also do validation or other things here  
16 - console.log(this.className);  
17 - }  
18 -  
19 - getClassName() {  
20 - return this.className;  
21 - }  
22 -  
23 - constructor(private http: Http, private router: Router) { }  
24 -  
25 -}  
26 \ No newline at end of file 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js deleted
View file @07ec029
1 -"use strict";  
2 -Object.defineProperty(exports, "__esModule", { value: true });  
3 -var DBOperation;  
4 -(function (DBOperation) {  
5 - DBOperation[DBOperation["create"] = 1] = "create";  
6 - DBOperation[DBOperation["update"] = 2] = "update";  
7 - DBOperation[DBOperation["delete"] = 3] = "delete";  
8 -})(DBOperation = exports.DBOperation || (exports.DBOperation = {}));  
9 -//# sourceMappingURL=enum.js.map  
10 \ No newline at end of file 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js.map deleted
View file @07ec029
1 -{"version":3,"file":"enum.js","sourceRoot":"","sources":["enum.ts"],"names":[],"mappings":";;AAAA,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,iDAAU,CAAA;IACV,iDAAU,CAAA;IACV,iDAAS,CAAA;AACb,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB"}  
2 \ No newline at end of file 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js deleted
View file @07ec029
1 -"use strict";  
2 -Object.defineProperty(exports, "__esModule", { value: true });  
3 -var Global = (function () {  
4 - function Global() {  
5 - }  
6 - return Global;  
7 -}());  
8 -Global.BASE_USER_ENDPOINT = 'api/userapi/';  
9 -exports.Global = Global;  
10 -//# sourceMappingURL=global.js.map  
11 \ No newline at end of file 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js.map deleted
View file @07ec029
1 -{"version":3,"file":"global.js","sourceRoot":"","sources":["global.ts"],"names":[],"mappings":";;AAAA;IAAA;IAEA,CAAC;IAAD,aAAC;AAAD,CAAC,AAFD;AACkB,yBAAkB,GAAG,cAAc,CAAC;AADzC,wBAAM"}  
2 \ No newline at end of file 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.ts
  View file @9781198
1 export class GlobalService { 1 export class GlobalService {
2 resourceBaseUrl: string = ""; 2 resourceBaseUrl: string = "";
3 - hostURL: string = ""; 3 + hostURL: string = "";
  4 + UserId: number = 6;
  5 + UserType: number = 0;
  6 + AccountType: number = 0;
4 constructor() { 7 constructor() {
5 this.hostURL = window.location.hostname; 8 this.hostURL = window.location.hostname;
6 - this.resourceBaseUrl = "http://192.168.86.13:92/DiscountCode"; 9 + this.resourceBaseUrl = "http://192.168.84.242:97/User";
7 } 10 }
8 } 11 }
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/assets/styles/admin-custom.css
  View file @9781198
@@ -130,21 +130,4 @@ @@ -130,21 +130,4 @@
130 background: #0095da; 130 background: #0095da;
131 color: #fff; 131 color: #fff;
132 } 132 }
133 -.well{border-radius:0;}  
134 -.help-block {  
135 - margin-bottom: 4px;  
136 -}  
137 /*30-1-2017*/ 133 /*30-1-2017*/
138 -.table-fixed tbody {  
139 - display:block;  
140 - height:250px;  
141 - overflow:auto;  
142 -}  
143 -.table-fixed thead, .table-fixed tbody tr {  
144 - display:table;  
145 - width:100%;  
146 - table-layout:fixed;  
147 -}  
148 -.table-fixed thead {  
149 - width: calc( 100% - 0em )  
150 -}  
151 \ No newline at end of file 134 \ No newline at end of file
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/index.html
  View file @9781198
@@ -9,10 +9,12 @@ @@ -9,10 +9,12 @@
9 <link href="../assets/styles/bootstrap.css" rel="stylesheet"> 9 <link href="../assets/styles/bootstrap.css" rel="stylesheet">
10 <link href="../assets/styles/main.css" rel="stylesheet"> 10 <link href="../assets/styles/main.css" rel="stylesheet">
11 <link href="../assets/styles/admin-custom.css" rel="stylesheet"> 11 <link href="../assets/styles/admin-custom.css" rel="stylesheet">
  12 + <link href="../assets/styles/angular-custom.css" rel="stylesheet">
  13 + <link href="assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet">
  14 + <link href="assets/styles/fixed_table_rc.css" type="text/css" rel="stylesheet" media="all" />
12 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> 15 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
13 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic"> 16 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic">
14 - <link href="../assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet">  
15 - 17 +
16 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> 18 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
17 <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> 19 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
18 <!--[if lt IE 9]> 20 <!--[if lt IE 9]>
@@ -29,18 +31,11 @@ @@ -29,18 +31,11 @@
29 <script src="../assets/scripts/jquery-1.11.3.min.js"></script> 31 <script src="../assets/scripts/jquery-1.11.3.min.js"></script>
30 <script src="../assets/scripts/bootstrap.js"></script> 32 <script src="../assets/scripts/bootstrap.js"></script>
31 <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script> 33 <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
32 - <script src="../assets/scripts/bootstrap-datetimepicker.min.js"></script> 34 + <script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script>
  35 + <script src="../assets/scripts/fixed_table_rc.js" type="text/javascript"></script>
33 <!--Nav--> 36 <!--Nav-->
34 <script> 37 <script>
35 $(function () { 38 $(function () {
36 - $('#datetimepicker1, #datetimepicker2').datetimepicker({  
37 - // language: 'pt-BR'  
38 - });  
39 - //$('#datetimepicker1').datepicker()  
40 - //.on('changeDate', function(e) {  
41 - //$('#searchStartDate').val($('#datetimepicker1').val());  
42 - //});  
43 - $('#searchStartDate').val($('#datetimepicker1').val());  
44 $("#slider-range-min-2").slider({ 39 $("#slider-range-min-2").slider({
45 range: "min", 40 range: "min",
46 min: 1, 41 min: 1,
@@ -53,26 +48,31 @@ @@ -53,26 +48,31 @@
53 $("#amount-2").val($("#slider-vertical-2").slider("value")); 48 $("#amount-2").val($("#slider-vertical-2").slider("value"));
54 49
55 }); 50 });
56 -  
57 - //$('#fixed_hdr2').fxdHdrCol({  
58 - //fixedCols: 0,  
59 - //width: "100%",  
60 - //height: 300,  
61 - //colModal: [  
62 - //{ width: 150, align: 'center' },  
63 - //{ width: 150, align: 'center' },  
64 - //{ width: 150, align: 'Center' },  
65 - //{ width: 150, align: 'Center' },  
66 - //{ width: 150, align: 'Center' },  
67 - //{ width: 100, align: 'Center' },  
68 - //{ width: 130, align: 'Center' },  
69 - //{ width: 200, align: 'center' },  
70 - //{ width: 200, align: 'Center' },  
71 - //{ width: 100, align: 'center' },  
72 - //{ width: 100, align: 'center' },  
73 - //],  
74 - //sort: true  
75 - //}); 51 + </script>
  52 + <script>
  53 + $(function () {
  54 +
  55 +
  56 + $('#fixed_hdr2').fxdHdrCol({
  57 + fixedCols: 0,
  58 + width: "100%",
  59 + height: 300,
  60 + colModal: [
  61 + { width: 150, align: 'center' },
  62 + { width: 150, align: 'center' },
  63 + { width: 150, align: 'Center' },
  64 + { width: 150, align: 'Center' },
  65 + { width: 150, align: 'Center' },
  66 + { width: 100, align: 'Center' },
  67 + { width: 130, align: 'Center' },
  68 + { width: 200, align: 'center' },
  69 + { width: 200, align: 'Center' },
  70 + { width: 100, align: 'center' },
  71 + { width: 100, align: 'center' },
  72 + ],
  73 + sort: true
  74 + });
  75 + });
76 </script> 76 </script>
77 <!--Nav--> 77 <!--Nav-->
78 78
400-SOURCECODE/AIAHTML5.sln
  View file @9781198
@@ -7,8 +7,6 @@ Project(&quot;{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}&quot;) = &quot;AIAHTML5.API&quot;, &quot;AIAHTML5.AP @@ -7,8 +7,6 @@ Project(&quot;{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}&quot;) = &quot;AIAHTML5.API&quot;, &quot;AIAHTML5.AP
7 EndProject 7 EndProject
8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.Web", "AIAHTML5.Web\AIAHTML5.Web.csproj", "{B6FBCFF8-360B-402E-B336-2F96CB07F69F}" 8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.Web", "AIAHTML5.Web\AIAHTML5.Web.csproj", "{B6FBCFF8-360B-402E-B336-2F96CB07F69F}"
9 EndProject 9 EndProject
10 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.ADMIN.Web", "AIAHTML5.ADMIN.Web\AIAHTML5.ADMIN.Web.csproj", "{B15F60A8-D4B3-46D1-964D-02B2FE7059F5}"  
11 -EndProject  
12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.ADMIN.API", "AIAHTML5.ADMIN.API\AIAHTML5.ADMIN.API.csproj", "{D36572A8-B888-44C3-BB07-121129359000}" 10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.ADMIN.API", "AIAHTML5.ADMIN.API\AIAHTML5.ADMIN.API.csproj", "{D36572A8-B888-44C3-BB07-121129359000}"
13 EndProject 11 EndProject
14 Global 12 Global
@@ -25,10 +23,6 @@ Global @@ -25,10 +23,6 @@ Global
25 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU 23 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU 24 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.Build.0 = Release|Any CPU 25 {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.Build.0 = Release|Any CPU
28 - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU  
29 - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Debug|Any CPU.Build.0 = Debug|Any CPU  
30 - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Release|Any CPU.ActiveCfg = Release|Any CPU  
31 - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Release|Any CPU.Build.0 = Release|Any CPU  
32 {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 26 {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33 {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.Build.0 = Debug|Any CPU 27 {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.Build.0 = Debug|Any CPU
34 {D36572A8-B888-44C3-BB07-121129359000}.Release|Any CPU.ActiveCfg = Release|Any CPU 28 {D36572A8-B888-44C3-BB07-121129359000}.Release|Any CPU.ActiveCfg = Release|Any CPU