Commit 742d6d60a147e001ed7bfc5f2c3200a08d1c6533

Authored by Mitali Srivastava
1 parent 79de4a4f

CA module changes

400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
1 AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService", 1 AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",
2 function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) { 2 function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) {
3 - $rootScope.currentActiveModuleTitle = pages[3].name; 3 + $rootScope.currentActiveModuleTitle = pages[4].name;
4 $scope.showme = true; 4 $scope.showme = true;
5 $scope.AnimationData; 5 $scope.AnimationData;
6 $scope.CAAllBodyRegion = []; 6 $scope.CAAllBodyRegion = [];
@@ -35,7 +35,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -35,7 +35,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
35 $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; 35 $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
36 36
37 37
38 - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openView($event)">' 38 + var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
39 + '<div class="thumbnail" >' 39 + '<div class="thumbnail" >'
40 + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >' 40 + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
41 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); 41 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
@@ -3,40 +3,39 @@ @@ -3,40 +3,39 @@
3 <div class="main"> 3 <div class="main">
4 4
5 <div class="row"> 5 <div class="row">
6 - <div class="col-sm-12 stickey-area" style="padding-left:25px; width:99%"> 6 + <div class="col-sm-12 stickey-area" style="padding-left:19px; width:99%">
7 <div class="breadcrumb"> 7 <div class="breadcrumb">
8 - <div class="row">  
9 - <h4 class="text-center text-primary paddingbtm5">Display Image By</h4> 8 + <div class="row center-block">
  9 + <h5 class="text-center text-primary txt-white f15">Display Image By</h5>
10 <div class="col-sm-2">&nbsp;</div> 10 <div class="col-sm-2">&nbsp;</div>
11 - <div class="col-sm-2"> 11 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
12 <div class="form-group"> 12 <div class="form-group">
13 - <h5 class="text-center text-primary paddingbtm5">Body Region</h5> 13 + <h6 class="text-center text-primary txt-white f11">Body Region</h6>
14 <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item"> 14 <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item">
15 <option value="">All</option> 15 <option value="">All</option>
16 </select> 16 </select>
17 </div> 17 </div>
18 </div> 18 </div>
19 - <div class="col-sm-2"> 19 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
20 <div class="form-group"> 20 <div class="form-group">
21 - <h5 class="text-center text-primary paddingbtm5">Body System</h5> 21 + <h6 class="text-center text-primary txt-white f11">Body System</h6>
22 <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item"> 22 <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item">
23 <option value="">All</option> 23 <option value="">All</option>
24 </select> 24 </select>
25 </div> 25 </div>
26 </div> 26 </div>
27 -  
28 - <div class="col-sm-2"> 27 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
29 <div class="form-group"> 28 <div class="form-group">
30 - <h5 class="text-center text-primary paddingbtm5">Medical Speciality</h5> 29 + <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>
31 <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item"> 30 <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item">
32 <option value="">All</option> 31 <option value="">All</option>
33 </select> 32 </select>
34 </div> 33 </div>
35 </div> 34 </div>
36 - <div class="col-lg-2 col-sm-4"> 35 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
37 <div class="form-group"> 36 <div class="form-group">
38 - <h5 class="text-center text-primary paddingbtm5">Search</h5>  
39 - <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> 37 + <h6 class="text-center text-primary txt-white f11">Search</h6>
  38 + <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
40 </div> 39 </div>
41 </div> 40 </div>
42 </div> 41 </div>
@@ -46,36 +45,36 @@ @@ -46,36 +45,36 @@
46 <div class="row tab-content" style="padding-left:25px; width:99%"> 45 <div class="row tab-content" style="padding-left:25px; width:99%">
47 <div role="tabpanel" class="tab-pane active" id="grid-view"> 46 <div role="tabpanel" class="tab-pane active" id="grid-view">
48 </div> 47 </div>
49 - <div role="tabpanel" class="tab-pane active" id="list-view">  
50 - <div class="col-sm-12 table-responsive well" style="padding-left:25px; width:99%;max-height:350px;overflow:auto">  
51 - <table class="table table-hover table-fixed bg-white" style="padding-left:25px; width:100%;">  
52 - <thead> 48 + <div role="tabpanel" class="tab-pane" id="list-view">
  49 + <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">
  50 + <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
  51 + <thead class="clstheadca">
53 <tr class="active"> 52 <tr class="active">
54 - <th>Title</th>  
55 - <th>Region</th>  
56 - <th>System</th>  
57 - <th>Specialty</th> 53 + <th style="min-width: 250px;">Title</th>
  54 + <th style="min-width: 250px;">Region</th>
  55 + <th style="min-width: 260px;">System</th>
  56 + <th style="min-width: 280px;">Specialty</th>
58 </tr> 57 </tr>
59 </thead> 58 </thead>
60 - <tbody ng-if="!filterstring">  
61 - <tr ng-repeat="item in selectedCAlistViewData">  
62 - <td ng-click="showItem(item._id)"> 59 + <tbody ng-if="!filterstring" class="clstbodyca">
  60 + <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAlistViewData">
  61 + <td style="max-width: 250px;">
63 {{item._Title}} 62 {{item._Title}}
64 </td> 63 </td>
65 - <td> 64 + <td style="max-width: 250px;">
66 {{item._BodyRegion}} 65 {{item._BodyRegion}}
67 </td> 66 </td>
68 - <td> 67 + <td style="min-width: 260px;">
69 {{item._BodySystem}} 68 {{item._BodySystem}}
70 </td> 69 </td>
71 - <td> 70 + <td style="max-width: 280px;">
72 {{item._MedicalSpecialty}} 71 {{item._MedicalSpecialty}}
73 </td> 72 </td>
74 </tr> 73 </tr>
75 </tbody> 74 </tbody>
76 - <tbody ng-if="filterstring">  
77 - <tr ng-repeat="item in searchCAlistViewData">  
78 - <td ng-click="showItem(item._id)"> 75 + <tbody ng-if="filterstring" class="clstbody">
  76 + <tr ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in searchCAlistViewData">
  77 + <td>
79 {{item._Title}} 78 {{item._Title}}
80 </td> 79 </td>
81 <td> 80 <td>
@@ -91,13 +90,18 @@ @@ -91,13 +90,18 @@
91 </tbody> 90 </tbody>
92 </table> 91 </table>
93 </div> 92 </div>
94 - <div class="col-sm-12 well" ng-show=" hiderow" style="padding-left:25px;padding-top:10px;">  
95 - <div class="col-sm-3 col-lg-3 no-padding">  
96 - <div class="thumbnail no-margin">  
97 - <img src="{{SelectedCAthumbImage}}" style="width:100%;height:100%;" alt=" " title=" "> 93 + <div class="col-sm-12" ng-show=" hiderow" style="padding-left:25px;padding-top:10px;">
  94 + <div class="row well">
  95 + <div class="col-sm-3 col-lg-2 no-padding">
  96 + <div class="thumbnail no-margin">
  97 + <img src="{{SelectedCAthumbImage}}" style="width:100%;height:100%;" alt=" " title=" ">
  98 + </div>
  99 + </div>
  100 + <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
  101 + <p class="f11" ng-bind-html="SelectedCASummary"></p>
  102 + <button type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
98 </div> 103 </div>
99 </div> 104 </div>
100 - <div class="col-sm-8 col-lg-8" style="padding-left:10px;"><p ng-bind-html="SelectedCASummary"></p></div>  
101 </div> 105 </div>
102 </div> 106 </div>
103 </div> 107 </div>
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 </tr> 122 </tr>
123 </tbody> 123 </tbody>
124 <tbody ng-if="filterstring" class="clstbody"> 124 <tbody ng-if="filterstring" class="clstbody">
125 - <tr ng-click="showItem(item._id)" ng-repeat="item in searchCIlistViewData"> 125 + <tr ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in searchCIlistViewData">
126 <td> 126 <td>
127 {{item._Title}} 127 {{item._Title}}
128 </td> 128 </td>
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -717,7 +717,7 @@ textarea { @@ -717,7 +717,7 @@ textarea {
717 .pad-lftrgt3 {padding-left:2px; padding-right:2px;} 717 .pad-lftrgt3 {padding-left:2px; padding-right:2px;}
718 .table-txt12 tr th, .table-txt12 tr td {font-size:12px; padding:2px 8px !important; vertical-align:middle; cursor:pointer;} 718 .table-txt12 tr th, .table-txt12 tr td {font-size:12px; padding:2px 8px !important; vertical-align:middle; cursor:pointer;}
719 719
720 -.clsthead tr { 720 +.clsthead tr,.clstheadca tr {
721 display: block; 721 display: block;
722 position: relative; 722 position: relative;
723 } 723 }
@@ -725,8 +725,12 @@ textarea { @@ -725,8 +725,12 @@ textarea {
725 min-width: 180px; 725 min-width: 180px;
726 text-align: left; 726 text-align: left;
727 } 727 }
  728 +.clstheadca tr th {
  729 + /*min-width: 255px;*/
  730 + text-align: left;
  731 +}
728 732
729 -.clstbody { 733 +.clstbody,.clstbodyca {
730 display: block; 734 display: block;
731 height: 200px; 735 height: 200px;
732 width: 100%; 736 width: 100%;
@@ -738,6 +742,15 @@ textarea { @@ -738,6 +742,15 @@ textarea {
738 text-align: left; 742 text-align: left;
739 } 743 }
740 744
  745 +.clstbodyca tr td {
  746 + /*max-width: 260px;*/
  747 + text-align: left;
  748 + word-wrap:break-word;
  749 +
  750 +}
  751 +
  752 +
  753 +
741 .cur-pot { 754 .cur-pot {
742 cursor:pointer; 755 cursor:pointer;
743 } 756 }