diff --git a/src/main/java/com/asset/master/MasterRestController.java b/src/main/java/com/asset/master/MasterRestController.java index 527d678..6cfc5b5 100644 --- a/src/main/java/com/asset/master/MasterRestController.java +++ b/src/main/java/com/asset/master/MasterRestController.java @@ -14,12 +14,12 @@ public class MasterRestController { @Autowired MasterRepository masterRepo; -// @GetMapping(value = "/search/getMasterName") -// public List getMasterName() { -// List obj = masterRepo.findAllMasterName(); -// System.out.println("OBJ---:"+obj); -// return obj; -// } + @GetMapping(value = "/getMasterName") + public List getMasterName() { + List obj = masterRepo.findAllMasterName(); + //System.out.println("OBJ--2-:"+obj); + return obj; + } // @GetMapping(value = "/client/{searchTerms}") // public List> getClientNameKeyword(@PathVariable("searchTerms") String searchTerms) { diff --git a/src/main/resources/static/assets/js/local.js b/src/main/resources/static/assets/js/local.js index 931dfb8..de45778 100644 --- a/src/main/resources/static/assets/js/local.js +++ b/src/main/resources/static/assets/js/local.js @@ -187,15 +187,11 @@ function verifyOtp(){ } //Getting Master Name -function getMasterName() { - -//$('#assetStreet option:not(:first)').remove(); -//var locationId = $this.value; +/*function getMasterName() { $.ajax({ type: "GET", - url: '/qr-feedback/master/search/getMasterName', - //data: {'locationId':locationId}, + url: '/qr-feedback/master/getMasterName', dataType: 'json', success: function(bodyMessage) { var tempJson = bodyMessage['obj']; @@ -210,4 +206,4 @@ function getMasterName() { alert(ts) } }); -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/src/main/resources/templates/asset-detail-entry.html b/src/main/resources/templates/asset-detail-entry.html index a79f302..daa41eb 100644 --- a/src/main/resources/templates/asset-detail-entry.html +++ b/src/main/resources/templates/asset-detail-entry.html @@ -9,7 +9,33 @@
+ @@ -44,68 +70,65 @@
-
-
-
-
-
- - - -
- +
- +
- +
- +
- +
- +
diff --git a/src/main/resources/templates/asset-master-entry.html b/src/main/resources/templates/asset-master-entry.html index b52d6d4..7eee706 100644 --- a/src/main/resources/templates/asset-master-entry.html +++ b/src/main/resources/templates/asset-master-entry.html @@ -105,7 +105,7 @@ $('#assetMasterEntryFormRest').click(function(){
- +
@@ -126,7 +126,7 @@ $('#assetMasterEntryFormRest').click(function(){
- +
@@ -156,10 +156,10 @@ $('#assetMasterEntryFormRest').click(function(){
- + - +