ADAM / AIAHTML5

Merged
Merge Request #912 · created by Mukul Rajput

Upadte cam name

From UpadteCAM_Name into Develop

Merged by Amrita Vishnoi

2 participants
Inline Side-by-side
Showing 2 changed files
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  Edit  View file @79c2892
... ... @@ -1616,7 +1616,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1616 1616 })
1617 1617 },
1618 1618 function (error) {
1619   - // handle errors here
  1619 +
1620 1620 console.log(' error: ' + error.statusText);
1621 1621 }
1622 1622 )
... ... @@ -1634,7 +1634,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1634 1634 var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
1635 1635 var viewNmeHtml = '<option>' + currentView + '</option>'
1636 1636 $('#viewName').append(viewNmeHtml);
1637   - //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
  1637 +
1638 1638 $rootScope.isLoading = false;
1639 1639 $('#spinner').css('visibility', 'hidden');
1640 1640  
... ...
500-DBDump/additionalScript/UpdateModuleName.sql
  Edit  View file @79c2892
1   -UPdate ResourceModule set Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE'
2   -where Title='CAM';
3 1 \ No newline at end of file
  2 +UPdate ResourceModule set Title='Complementary and Alternative Medicine'
  3 +where Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE';
4 4 \ No newline at end of file
... ...