|
|
|
@ -129,7 +129,9 @@ function getDataStat(respone){
|
|
|
|
|
|
|
|
|
|
function getData(respone) { |
|
|
|
|
// console.log(dataInstrument)
|
|
|
|
|
// console.log(respone)
|
|
|
|
|
console.log(respone) |
|
|
|
|
console.log("---------------- Next") |
|
|
|
|
console.log(respone.next)
|
|
|
|
|
// console.log(respone.results)
|
|
|
|
|
console.log(dataInstrument)
|
|
|
|
|
dataInstrument = dataInstrument.concat(respone.results) |
|
|
|
@ -192,7 +194,7 @@ function getData(respone) {
|
|
|
|
|
tagMiniImage = tagMiniImage |
|
|
|
|
+'<img id="myImg'+j+''+i+'" class="miniImage" style="'+style4+'" src="" alt=""/>' |
|
|
|
|
+'<h6 class="miniImage flexCenter" >ไม่มีรูปภาพ</h6>'; |
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
console.log('*********** < 2 ***********') |
|
|
|
@ -253,12 +255,19 @@ function getData(respone) {
|
|
|
|
|
+'</div>'; |
|
|
|
|
} |
|
|
|
|
if(respone.next != null){ |
|
|
|
|
nextUrl = '' |
|
|
|
|
moreText = '' |
|
|
|
|
moreText = "<div class='cardStyle flexCenter' style='margin-bottom:10px;height:60px;background-color: #E0E0E0;' onClick='getNextUrl()'>" |
|
|
|
|
+"<h4>More</h4>" |
|
|
|
|
+"</div>"; |
|
|
|
|
nextUrl = respone.next |
|
|
|
|
document.getElementById("more").innerHTML = moreText; |
|
|
|
|
}
|
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
nextUrl = '' |
|
|
|
|
moreText = '' |
|
|
|
|
document.getElementById("more").innerHTML = moreText; |
|
|
|
|
} |
|
|
|
|
start = dataInstrument.length |
|
|
|
|
|
|
|
|
|
document.getElementById("modalAll").innerHTML = document.getElementById("modalAll").innerHTML+modalText |
|
|
|
|