diff --git a/.gitignore b/.gitignore index 7fb05e1..dd2db7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,45 @@ -# git ignore file -[Dd]ebug*/ -*.lib -Thumbs.db -obj/ -*.obj -*.exe -*.pdb -*.user -*.aps -*.pch -*.vspscc -*_i.c -*_p.c -*.ncb -*.suo -*.sln.docstates -*.tlb -*.tlh -*.bak -*.cache -*.ilk -*.log -[Dd]ebug*/ -*.lib -*.sbr -obj/ -[Rr]elease*/ -_ReSharper*/ -[Tt]est[Rr]esult* -*.vssscc -$tf*/ -400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user -400-SOURCECODE\AIAHTML5.Web\bin -300-PROTOTYPES/POC/AIAHTML5 -400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig -400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig -400-SOURCECODE/AIAHTML5.Web/index.html.orig -400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll -400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb - -400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig -400-SOURCECODE/.vs/config/applicationhost.config -400-SOURCECODE/.vs/config/applicationhost.config \ No newline at end of file +# git ignore file +[Dd]ebug*/ +*.lib +Thumbs.db +obj/ +*.obj +*.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.sln.docstates +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +[Dd]ebug*/ +*.lib +*.sbr +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.vssscc +$tf*/ +400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user +400-SOURCECODE\AIAHTML5.Web\bin +300-PROTOTYPES/POC/AIAHTML5 +400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig +400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig +400-SOURCECODE/AIAHTML5.Web/index.html.orig +400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll +400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb + +400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig +400-SOURCECODE/.vs/config/applicationhost.config +400-SOURCECODE/.vs/config/applicationhost.config +400-SOURCECODE/AIAHTML5.ADMIN.Web \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/AIAHTML5.ADMIN.Web.csproj b/400-SOURCECODE/AIAHTML5.ADMIN.Web/AIAHTML5.ADMIN.Web.csproj index 71af425..91d90fa 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/AIAHTML5.ADMIN.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/AIAHTML5.ADMIN.Web.csproj @@ -20,7 +20,7 @@ - 1.4 + 1.8 true @@ -63,46 +63,38 @@ - - - - - - - - - - - - - Web.config - - - Web.config - - - - - - - + + + + + + + + + + + + + + + @@ -114,6 +106,28 @@ + + + + + + + + + + + + + Web.config + + + Web.config + + + + + + @@ -127,16 +141,31 @@ - + + + + + + + + + + + + + + + + diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/package.json b/400-SOURCECODE/AIAHTML5.ADMIN.Web/package.json index 7854a5c..6290101 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/package.json +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/package.json @@ -22,7 +22,10 @@ "@angular/platform-browser-dynamic": "^4.2.4", "@angular/router": "^4.2.4", "core-js": "^2.4.1", - "ngx-bootstrap": "^2.0.0-rc.0", + "ng2-bs3-modal": "0.10.4", + "ng2-datetime-picker": "0.15.1", + "ng2-modal": "0.0.25", + "ng2-select2": "1.0.0-beta.10", "rxjs": "^5.4.2", "zone.js": "^0.8.14" }, diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.html b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.html index 9c7effb..0c35f11 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.html +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.html @@ -33,17 +33,17 @@
  • @@ -51,15 +51,14 @@
    • -
    • List User
      • +
    • List User
    • Add User
    • Unblock User
    • User Group
      • @@ -118,6 +117,22 @@
      +
      + + + + + + + + + - - + + + +
      diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts index 817bf39..63620b9 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts @@ -1,18 +1,16 @@ -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { UserService } from './components/UpdateProfile/user.service'; -import { ChangeUserPasswordService } from './components/ChangePassword/changeuserpassword.service'; +import { Component, OnInit } from '@angular/core'; +import { UserService } from './components/UserEntity/user.service'; import { ManageDiscountCodeService } from './components/ManageDiscountCode/managediscountcode.service'; - @Component({ selector: 'app-component', templateUrl: '../app/app.component.html', - providers: [UserService, ChangeUserPasswordService, ManageDiscountCodeService] + providers: [UserService, ManageDiscountCodeService] }) export class AppComponent implements OnInit { - constructor(private userservice: UserService) { } + constructor(private userservice: UserService, private managediscountservice: ManageDiscountCodeService) { } - ngOnInit(): void { } + ngOnInit(): void { } } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts index 910bb23..c33b0fa 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts @@ -1,3 +1,4 @@ + import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; @@ -6,31 +7,33 @@ import { RouterModule, Routes } from '@angular/router'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { APP_BASE_HREF } from '@angular/common'; import { HttpModule } from '@angular/http'; +import { Ng2Bs3ModalModule } from 'ng2-bs3-modal/ng2-bs3-modal'; //import { ModalModule } from 'ngx-bootstrap/modal'; -import { UpdateUserProfile } from './components/UpdateProfile/updateuserprofile.component'; -import { ChangeUserPassword } from './components/ChangePassword/changeuserpassword.component'; +import { UpdateUserProfile } from './components/UserEntity/updateuserprofile.component'; +import { ChangeUserPassword } from './components/UserEntity/changeuserpassword.component'; +import { ChangeUserID } from './components/UserEntity/changeuserid.component'; +import { UsersList } from './components/UserEntity/users.component'; import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component'; -import { ChangeUserId } from './components/changeuserid.component'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app.routing.module'; //import { AuthGuard } from '../app/authguard.service'; //import { AuthService } from '../app/auth.service'; //import { MyInterceptor } from '../app/token.interceptor'; -import { BsDatepickerModule } from 'ngx-bootstrap'; import { GlobalService } from './Shared/global'; - +import { ConfirmService } from './Shared/Confirm/confirm.service'; +import { ConfirmComponent } from "./Shared/Confirm/confirm.component" @NgModule({ declarations: [ - ChangeUserPassword, ChangeUserId, - UpdateUserProfile, ManageDiscountCode, - AppComponent + ChangeUserPassword, ChangeUserID, + UpdateUserProfile, UsersList, + ManageDiscountCode, + AppComponent, ConfirmComponent ], imports: [ - BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule, - BsDatepickerModule.forRoot() //ModalModule.forRoot() + BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule, Ng2Bs3ModalModule //ModalModule.forRoot() ], - providers: [ + providers: [GlobalService, ConfirmService, //AuthService, //AuthGuard, //{ @@ -39,7 +42,7 @@ import { GlobalService } from './Shared/global'; // multi: true //} { provide: APP_BASE_HREF, useValue: '/' } - , GlobalService + ], bootstrap: [AppComponent] }) diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts index b334f19..8fb5283 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts @@ -1,8 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { UpdateUserProfile } from './components/UpdateProfile/updateuserprofile.component'; -import { ChangeUserPassword } from './components/ChangePassword/changeuserpassword.component'; -import { ChangeUserId } from './components/changeuserid.component'; +import { UpdateUserProfile } from './components/UserEntity/updateuserprofile.component'; +import { ChangeUserPassword } from './components/UserEntity/changeuserpassword.component'; +import { ChangeUserID } from './components/UserEntity/changeuserid.component'; +import { UsersList } from './components/UserEntity/users.component'; import { ManageDiscountCode } from './components/ManageDiscountCode/managediscountcode.component'; //import { AuthGuard } from './authguard.service'; @@ -10,7 +11,8 @@ const appRoutes: Routes = [ //{ path: '', redirectTo:'updateuserprofile',pathMatch } { path: 'updateuserprofile', component: UpdateUserProfile }, { path: 'changeuserpassword', component: ChangeUserPassword }, - { path: 'changeuserid', component: ChangeUserId }, + { path: 'changeuserid', component: ChangeUserID }, + { path: 'users', component: UsersList }, { path: 'managediscountcode', component: ManageDiscountCode }, ]; diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.html b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.html index ed7ee17..f4f81e4 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.html +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.html @@ -1,91 +1,92 @@
      - -
      -

      Change User Password

      -
      - - -
      + +
      +

      Change User Password

      +
      + + +
      -
      -
      -
      -
      -
      **To change your profile fill all the text fields carefully.
      -
      - -
      -
      -
      -
      -
      -
      -
      -
      - -
      - - -
      -
      -
      - -
      - -
      Old password is required
      -
      -
      -
      - -
      - - (Minimum 8 characters) -
      New password of minimum 8 characters is required
      -
      -
      -
      - -
      - -
      Confirm password is required
      -
      -
      -
      -
      - - -
      -
      - -
      -
      - - -
      \ No newline at end of file + diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.ts index 5516d81..338b6d6 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.component.ts @@ -4,7 +4,6 @@ import { Router } from '@angular/router'; import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { User } from '../UpdateProfile/datamodel'; import { Http, Response } from '@angular/http'; - //import { Global } from '../../Shared/global'; //import { DBOperation } from 'S'; //import { Observable } from 'rxjs/Observable'; @@ -26,7 +25,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat this.user = new User(); this.alerts = ''; this.changeUserPasswordFrm = this.fb.group({ - userId: [''], loginId: ['', Validators.required], oldPassword: ['', Validators.required], newPassword: ['', [Validators.required, Validators.minLength(8)]], @@ -41,18 +39,15 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat } public onFormSubmit() { - this.alerts = ''; if(this.user.Password != this.changeUserPasswordFrm.value.oldPassword){ this.alerts = 'Old password is invalid'; } - if(this.user.Password == this.changeUserPasswordFrm.value.newPassword){ - this.alerts += '
      New password and old password must be different'; - } if(this.changeUserPasswordFrm.value.newPassword != this.changeUserPasswordFrm.value.confirmPassword){ this.alerts += '
      New password and confirm password must be same'; } - if(this.alerts == ''){ - var obj = this.changeUserPasswordFrm.value; + if(this.alerts != ''){ + this.user = this.changeUserPasswordFrm.value; + var obj = this.user return this.changeUserPasswordService.ChangeUserPassword(obj) .subscribe( n => (this.AfterInsertData(n)), @@ -70,7 +65,6 @@ constructor(private changeUserPasswordService: ChangeUserPasswordService, privat BindFormFields(data){ this.user = data[0]; - this.changeUserPasswordFrm.controls['userId'].setValue(this.user.Id); this.changeUserPasswordFrm.controls['loginId'].setValue(this.user.LoginId); } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.service.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.service.ts index e227349..917721b 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.service.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ChangePassword/changeuserpassword.service.ts @@ -38,18 +38,12 @@ export class ChangeUserPasswordService { GetUserById() { return this.http.get(this.commonService.resourceBaseUrl + "/api/GetUserProfile/1") .map(this.extractData) - .catch((res: Response) => this.handleError(res)); + .catch((res: Response) => this.handleError(res));; } - ChangeUserPassword(obj: any) { + ChangeUserPassword(obj: User) { //let options = new RequestOptions({ headers: this.headers }); - var jsonData = {'id': obj.userId, 'newPassword': obj.newPassword }; - console.log(obj); - var headers = new Headers({ - 'Content-Type': 'application/json' - }); - return this.http.post(this.commonService.resourceBaseUrl + "/api/ChangeUserPassword", - JSON.stringify(jsonData), {headers: headers}) + return this.http.post(this.commonService.resourceBaseUrl + "/api/ChangeUserPassword", obj) .map(this.extractData) .catch((res: Response) => this.handleError(res)); } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode.zip b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode.zip deleted file mode 100644 index 7c89400..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode.zip +++ /dev/null diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts index 20dbc98..ea5f699 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter } from '@ import { ManageDiscountCodeService } from './managediscountcode.service'; import { Router } from '@angular/router'; import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { DiscountCode } from '../UpdateProfile/datamodel'; -import { BsDatepickerModule } from 'ngx-bootstrap'; +import { DiscountCode } from '../UserEntity/datamodel'; +//import { BsDatepickerModule } from 'ngx-bootstrap'; import { Http, Response } from '@angular/http'; //import { Global } from '../../Shared/global'; diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts index f0518f4..9724f49 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts @@ -1,30 +1,11 @@ export class User { + LoginId: string; + Password: string; Id: number; FirstName: string; LastName: string; EmailId: string; - LoginId: string; - Password: string; - SecurityQuestionId: number; - SecurityAnswer: string; - CreatorId: number; - CreationDate: Date; - DeactivationDate: Date; - ModifierId: number; - ModifiedDate: Date; - UserTypeId: number; - IsActive: boolean; } - -export class DiscountCode { - Id: number; - DiscountCode: string; - StartDate: Date; - EndDate: Date; - Percentage: DoubleRange; - IsActive: boolean; -} - //export class User { // userId: number; // firstName: string; diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.html b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.html index ec61a57..83a9921 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.html +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.html @@ -1,76 +1,87 @@
      - -
      -

      Update User Profile

      -
      - - -
      + +
      +

      Update Profile

      +
      +
      -
      -
      -
      -
      -
      **To update your profile fill all the text fields carefully.
      -
      - -
      -
      - - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      -
      - - - -
      -
      -
      - -
      \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.ts index 33910f2..a491d3f 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/updateuserprofile.component.ts @@ -1,13 +1,18 @@ -import { Component, OnInit, AfterViewInit } from '@angular/core'; +import { Component, OnInit, AfterViewInit,ViewChild } from '@angular/core'; import { UserService } from '../UpdateProfile/user.service'; import { Router } from '@angular/router'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { User } from '../UpdateProfile/datamodel'; import { Http, Response } from '@angular/http'; //import { Global } from '../../Shared/global'; //import { DBOperation } from 'S'; -//import { Observable } from 'rxjs/Observable'; - +import { Observable } from 'rxjs/Observable'; +import { ConfirmService } from '../../Shared/Confirm/confirm.service'; +import 'rxjs/Rx'; +import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/filter'; + @Component({ templateUrl:'./updateuserprofile.component.html' // '../../../../../wwwroot/html/UpdateProfile/updateuserprofile.component.html' @@ -27,13 +32,18 @@ export class UpdateUserProfile implements OnInit { useFname: string; error; status: boolean; + alerts: string; + emailPattern = "^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$"; + //@ViewChild("profileModal") + //profileModal: ModalComponent; //errorMessage: any; - - constructor(private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http) { } + constructor(private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http, + private _confirmService: ConfirmService + ) { } ngOnInit(): void { this.user = new User(); - + this.alerts = ''; //this.userservice.GetUserById(this.UserId); this.userFrm = this.fb.group({ id: [''], @@ -68,15 +78,17 @@ export class UpdateUserProfile implements OnInit { .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = error); } UpdateUserProfile(this) { - debugger; + // debugger; this.user = this.userFrm.value; + //if(this.user.) console.log(this.user); var obj = this.user - return this.userservice.UpdateUserProfileById(obj) - .subscribe( - n => (this.AfterInsertData(n)), - error => this.error = error); - + if (this.userFrm.valid) { + return this.userservice.UpdateUserProfileById(obj) + .subscribe( + n => (this.AfterInsertData(n)), + error => this.error = error); + } } AfterInsertData(data) { //debugger; @@ -87,6 +99,10 @@ export class UpdateUserProfile implements OnInit { return false; } else { this.status = true; + debugger; + + this._confirmService.activate("User Profile Updated Successfully.", "alertMsg"); + //this.profileModal.open(); // this.submitted = false; // this.GetAllAcctMgr(); // this.DisableAllControls(); diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/user.service.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/user.service.ts index f9bc4ac..8bd38be 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/user.service.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/user.service.ts @@ -11,28 +11,7 @@ import { GlobalService } from '../../Shared/global'; @Injectable() export class UserService { - constructor(private _http: Http, private http: Http, private commonService: GlobalService ) { } - //constructor() { } - //public GetUserById(Id: any): Observable { - // return this.http.request( - // 'GET', - // 'http://192.168.86.13:92/API/Api/Users/' + Id); - //} - - //GetUserByLoginIdPassword(LoginId: string, Password: string): Observable { - // return this.http.request( - // 'GET', - // 'http://192.168.86.13:92/API/Api/Users/{LoginId=' + LoginId + '&Password=' + Password + '}'); - //} - - //UpdateProfile(UserObj: User): Observable { - // return this.http.request( - // 'POST', - // 'http://192.168.86.13:92/API/Api/Users/UpdateProfile', - // { - // body: UserObj - // }); - //} + constructor(private http: Http, private commonService: GlobalService ) { } GetUserById() { @@ -43,7 +22,7 @@ export class UserService { } UpdateUserProfileById(obj: User) { //let options = new RequestOptions({ headers: this.headers }); - return this._http.post(this.commonService.resourceBaseUrl + "/api/UpdateProfile", obj) + return this.http.post(this.commonService.resourceBaseUrl + "/api/UpdateProfile", obj) .map(this.extractData) .catch((res: Response) => this.handleError(res)); } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/services/shareddataservice.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/services/shareddataservice.ts deleted file mode 100644 index 183efe6..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/services/shareddataservice.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Http, Response, Headers, RequestOptions, URLSearchParams } from '@angular/http'; -import { Router } from '@angular/router'; - -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; - -@Injectable() -export class SharedDataService { - - className: string = ''; - - setClassName(newValue) { - this.className = newValue; //you can also do validation or other things here - console.log(this.className); - } - - getClassName() { - return this.className; - } - - constructor(private http: Http, private router: Router) { } - -} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js deleted file mode 100644 index 421ac4c..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js +++ /dev/null @@ -1,9 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var DBOperation; -(function (DBOperation) { - DBOperation[DBOperation["create"] = 1] = "create"; - DBOperation[DBOperation["update"] = 2] = "update"; - DBOperation[DBOperation["delete"] = 3] = "delete"; -})(DBOperation = exports.DBOperation || (exports.DBOperation = {})); -//# sourceMappingURL=enum.js.map \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js.map b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js.map deleted file mode 100644 index ffae1a4..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/enum.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js deleted file mode 100644 index 43560cd..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js +++ /dev/null @@ -1,10 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var Global = (function () { - function Global() { - } - return Global; -}()); -Global.BASE_USER_ENDPOINT = 'api/userapi/'; -exports.Global = Global; -//# sourceMappingURL=global.js.map \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js.map b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js.map deleted file mode 100644 index 01f2dc2..0000000 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.js.map +++ /dev/null @@ -1 +0,0 @@ -{"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"} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.ts index dc95c04..234378d 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/shared/global.ts @@ -1,8 +1,11 @@ export class GlobalService { resourceBaseUrl: string = ""; - hostURL: string = ""; + hostURL: string = ""; + UserId: number = 6; + UserType: number = 0; + AccountType: number = 0; constructor() { this.hostURL = window.location.hostname; - this.resourceBaseUrl = "http://192.168.86.13:92/DiscountCode"; + this.resourceBaseUrl = "http://192.168.84.242:97/User"; } } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/assets/styles/admin-custom.css b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/assets/styles/admin-custom.css index df3f9bf..5e02040 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/assets/styles/admin-custom.css +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/assets/styles/admin-custom.css @@ -130,21 +130,4 @@ background: #0095da; color: #fff; } -.well{border-radius:0;} -.help-block { - margin-bottom: 4px; -} /*30-1-2017*/ -.table-fixed tbody { - display:block; - height:250px; - overflow:auto; -} -.table-fixed thead, .table-fixed tbody tr { - display:table; - width:100%; - table-layout:fixed; -} -.table-fixed thead { - width: calc( 100% - 0em ) -} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/index.html b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/index.html index d2bb2ef..1cff9ed 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/index.html +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/index.html @@ -9,10 +9,12 @@ + + + - - + + diff --git a/400-SOURCECODE/AIAHTML5.sln b/400-SOURCECODE/AIAHTML5.sln index 2f036e5..affc0ad 100644 --- a/400-SOURCECODE/AIAHTML5.sln +++ b/400-SOURCECODE/AIAHTML5.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.API", "AIAHTML5.AP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.Web", "AIAHTML5.Web\AIAHTML5.Web.csproj", "{B6FBCFF8-360B-402E-B336-2F96CB07F69F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.ADMIN.Web", "AIAHTML5.ADMIN.Web\AIAHTML5.ADMIN.Web.csproj", "{B15F60A8-D4B3-46D1-964D-02B2FE7059F5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIAHTML5.ADMIN.API", "AIAHTML5.ADMIN.API\AIAHTML5.ADMIN.API.csproj", "{D36572A8-B888-44C3-BB07-121129359000}" EndProject Global @@ -25,10 +23,6 @@ Global {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6FBCFF8-360B-402E-B336-2F96CB07F69F}.Release|Any CPU.Build.0 = Release|Any CPU - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B15F60A8-D4B3-46D1-964D-02B2FE7059F5}.Release|Any CPU.Build.0 = Release|Any CPU {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D36572A8-B888-44C3-BB07-121129359000}.Debug|Any CPU.Build.0 = Debug|Any CPU {D36572A8-B888-44C3-BB07-121129359000}.Release|Any CPU.ActiveCfg = Release|Any CPU