rajkiran 5 jaren geleden
bovenliggende
commit
ddacae46c0

File diff suppressed because it is too large
+ 1 - 1
Android/app/src/main/java/com/cygnusa/hyperm/AboutActivity.java


File diff suppressed because it is too large
+ 4666 - 0
Database/dev_hyperm_v2.sql


+ 1 - 1
Hyper-M_UserPortal/src/app/common/dashboard-dse-details/dashboard-dse-details.component.html

@@ -23,7 +23,7 @@
         <!-- <div class="timer" *ngIf="user_dashboard!=undefined"> {{user_dashboard.sales.achieved}}</div> -->
         <div class="load_content" (click)="showDetails(1)">
           <h6>MY PERFORMANCE</h6>
-          <p *ngIf="user_dashboard!=undefined">{{user_dashboard.sales.achieved}} / {{user_dashboard.sales.target}} TARGETED SALES</p>
+          <!-- <p *ngIf="user_dashboard!=undefined">{{user_dashboard.sales.achieved}} / {{user_dashboard.sales.target}} TARGETED SALES</p> -->
         </div>
       </div>
       <div class="box_right">

+ 2 - 24
Hyper-M_UserPortal/src/app/common/main-header/main-header.component.html

@@ -234,7 +234,7 @@
                         EMI CALCULATOR</a>
                 </li> -->
             <!-- (click)="goToSpecificUrl(item.link)" -->
-            <li class="dropdown nav-item">
+            <!-- <li class="dropdown nav-item">
                 <a class="nav-link dropdown-toggle" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
                     aria-expanded="true">MORE<span class="caret"></span>
                 </a>
@@ -242,49 +242,27 @@
                     <li *ngIf="!is_firsttime && user_role!=15" [ngClass]="menu_item==6?'active':''"
                         [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link" [routerLink]="['/wallet']">
-                            <!-- <img src="assets/img/bulletin.png"/> -->
                             MY WALLET</a>
                     </li>
                     <li *ngIf="is_firsttime && user_role!=15" [routerLinkActive]="['active']"
                         [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link">
-                            <!-- <img src="assets/img/bulletin.png"/> -->
                             MY WALLET</a>
                     </li>
-                    <!--360 view-->
                     <li *ngIf="!is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
                         [routerLinkActiveOptions]="{exact:true}">
-                        <!-- <a class="nav-link" (click)='gotoThreesixty()' [routerLink]="['/threesixty-dashboard']">MY PRODUCTS</a> -->
                         <a class="nav-link" (click)='gotoThreesixty()' [routerLink]="['/threesixty-dashboard']">PRODUCT
                             EXPERIENCE</a>
                     </li>
                     <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
                         [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <!-- <a class="nav-link">MY PRODUCTS
-                                    <span class="sr-only">(current)</span>
-                                </a> -->
                         <a class="nav-link">PRODUCT EXPERIENCE
                             <span class="sr-only">(current)</span>
                         </a>
                     </li>
-
-                    <!-- <li *ngIf="!is_firsttime && (user_role>7 && user_role<14 )" [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link" (click)='gotoThreesixty()' [routerLink]="['/threesixty-dashboard']">PRODUCT EXPERIENCE</a>
-                            </li>
-                            <li *ngIf="is_firsttime && (user_role>7 && user_role<14 )" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link">PRODUCT EXPERIENCE
-                                    <span class="sr-only">(current)</span>
-                                </a>
-                            </li> -->
-                    <!-- <li *ngIf="!is_firsttime && (user_role==7 || user_role == 14)" [ngClass]="menu_item==5?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link" [routerLink]="['/myusers']">MY USERS</a>
-                            </li>
-                            <li *ngIf="is_firsttime" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link">MY USERS</a>
-                            </li> -->
                 </ul>
-            </li>
+            </li> -->
 
          
 

+ 3 - 2
Hyper-M_UserPortal/src/app/sales_executive/dashboard-popup/dashboard-popup.component.html

@@ -8,7 +8,7 @@
                     <span aria-hidden="true">&times;</span>
                 </button>
                 <div class="sales" *ngIf="type==1">
-                    <h5>MY SALES PERFORMANCE</h5>
+                    <h5>MY PERFORMANCE</h5>
                     
                     <p class="achived" *ngIf="sales!=undefined&&sales.length>0">Achieved Sales</p>
                     <p class="achived" style='left:0;right:auto;' *ngIf="sales!=undefined&&sales.length>0">Data as on: {{content_data.data_as_on | date: 'dd-MMM-yyy'}}</p>
@@ -119,7 +119,8 @@
                             <p *ngIf="select_tab==2">Total Points Redeemed {{rewardpoints_pts.total_point}} </p>
                             <button class="btn primary" type="submit" style="width: auto;font-size: 16px;margin-top: 5px;" (click)="onClickRedeem()" *ngIf="rewardpoints_pts.is_redeem_point!=undefined && rewardpoints_pts.is_redeem_point==1">TRANSFER TO WALLET  </button>
                             <button class="btn primary" type="submit" style="width: auto;opacity:0.5;cursor:not-allowed;font-size: 16px;margin-top: 5px;" *ngIf="rewardpoints_pts.is_redeem_point!=undefined &&  rewardpoints_pts.is_redeem_point==0">TRANSFER TO WALLET  </button>
-                            <p class="minimum">Minimum {{rewardpoints_pts.min_redeem_point}} points required for redemption  <img src="assets/img/info.png" class="info_icon" (click)="showInfo();$event.stopPropagation();"/> </p>
+                            <p class="minimum"> Your passport to competitive learning  <img src="assets/img/info.png" class="info_icon" (click)="showInfo();$event.stopPropagation();"/> </p>
+                            <!-- Minimum {{rewardpoints_pts.min_redeem_point}} points required for redemption -->
                         </div>
                         <div class="info_box box_table pull-right" *ngIf="show_info">
                             <!-- <p>