- pin-lock works! -
+ + + + +@@ -46,7 +56,7 @@ - + diff --git a/src/app/pages/section-list/section-list.component.scss b/src/app/pages/section-list/section-list.component.scss index 8b8f13f..36b4a29 100644 --- a/src/app/pages/section-list/section-list.component.scss +++ b/src/app/pages/section-list/section-list.component.scss @@ -1,7 +1,16 @@ - ion-content { - contain: size style; - } +.header-md{ + background-color: #ff0303 !important; + color: #fff !important; +} +.sizeE{ + font-size: medium; + width: 30px; + height: 20px; +} +.p-0{ + padding: 0px !important; +} .card-class{ h6{ margin: 0px !important; @@ -98,4 +107,9 @@ // } - \ No newline at end of file + ion-content { + --padding-start: 16px; // Adjust as needed + --padding-end: 16px; // Adjust as needed + --padding-top: 16px; // Adjust as needed + --padding-bottom: 16px; // Adjust as needed + } \ No newline at end of file diff --git a/src/app/pages/section-list/section-list.component.ts b/src/app/pages/section-list/section-list.component.ts index c01a33d..c400182 100644 --- a/src/app/pages/section-list/section-list.component.ts +++ b/src/app/pages/section-list/section-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { NavController, NavParams } from '@ionic/angular'; +import { MenuController, NavController, NavParams } from '@ionic/angular'; import { SalesPdService } from '../providers/sales-pd/sales-pd.service'; import { ToastService } from 'src/providers/common-provider/toast.service'; import { OfflineManagerService } from '../providers/offline-manager/offline-manager.service'; @@ -27,24 +27,27 @@ export class SectionListComponent implements OnInit { config_expression: any; link: any; private apiUrl = environment - constructor(public navCtrl: NavController, public route: ActivatedRoute,private SalesPDService:SalesPdService,private toastProvider:ToastService, + constructor(public Menu:MenuController,public navCtrl: NavController, public route: ActivatedRoute,private SalesPDService:SalesPdService,private toastProvider:ToastService, private offlineManager:OfflineManagerService,private router: Router) { this.route.queryParams.subscribe(params => { console.log(params,params.hasOwnProperty('product_id'),params['product_id']) if(params.hasOwnProperty('product_id')){ this.product_id = params['product_id'] - // this.link=this.navParams.get('link') + this.getTemplate() + // this.link = this.navParams.get('link') // console.log(this.link) } }); this.sales_pd_type = localStorage.getItem('sales_pd_type') - this.getTemplate() + //alert(this.link); } - ngOnInit() {} + ngOnInit() { + this.getSectionStats() + } ionViewDidLoad() { console.log('ionViewDidLoad SectionListPage'); @@ -52,7 +55,14 @@ export class SectionListComponent implements OnInit { } + + + ionViewWillLeave(){ + this.Menu.enable(true); + } + ionViewDidEnter(){ + this.Menu.enable(false); setTimeout(()=>{ this.getSectionStats() },50) @@ -324,13 +334,15 @@ export class SectionListComponent implements OnInit { } goto(section_id: any) { - if (this.sales_pd_id == null && section_id != '1') { + console.log(section_id) + if (this.sales_pd_id == null && section_id != '1') { this.toastProvider.lenderappmessage("Please Fill General Section First !!"); return; } setTimeout(() => { - this.router.navigate(['section9', { section_id: section_id }]); + // this.navCtrl.navigateForward(`/section9/${section_id}`); + this.navCtrl.navigateForward('/section9', { queryParams:{ section_id: section_id }}); }, 10); } @@ -384,4 +396,12 @@ export class SectionListComponent implements OnInit { } } + goToUrl(url:any){ + window.open(url, '_blank'); + } + + goToBack(){ + this.router.navigate(['/sales-pd-list']); + } + } diff --git a/src/app/tabs/tabs-routing.module.ts b/src/app/tabs/tabs-routing.module.ts new file mode 100644 index 0000000..5bedb34 --- /dev/null +++ b/src/app/tabs/tabs-routing.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TabsRoutingModule { } diff --git a/src/app/tabs/tabs.component.html b/src/app/tabs/tabs.component.html new file mode 100644 index 0000000..fb9d990 --- /dev/null +++ b/src/app/tabs/tabs.component.html @@ -0,0 +1,3 @@ +
+ tabs works! +
diff --git a/src/app/tabs/tabs.component.scss b/src/app/tabs/tabs.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/tabs/tabs.component.spec.ts b/src/app/tabs/tabs.component.spec.ts new file mode 100644 index 0000000..778a687 --- /dev/null +++ b/src/app/tabs/tabs.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { TabsComponent } from './tabs.component'; + +describe('TabsComponent', () => { + let component: TabsComponent; + let fixture: ComponentFixture