Merge pull request 'update from server' (#1) from server into master
Reviewed-on: #1
This commit is contained in:
commit
22f9dd551e
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
||||||
->sheet('Platform')
|
->sheet('Platform')
|
||||||
->range('A:F')
|
->range('A:G')
|
||||||
->get();
|
->get();
|
||||||
$header = $sheets->pull(0);
|
$header = $sheets->pull(0);
|
||||||
$posts = Sheets::collection($header, $sheets);
|
$posts = Sheets::collection($header, $sheets);
|
||||||
@ -78,7 +78,7 @@
|
|||||||
|
|
||||||
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
||||||
->sheet('Platform')
|
->sheet('Platform')
|
||||||
->range('A:F')
|
->range('A:G')
|
||||||
->get();
|
->get();
|
||||||
$header = $sheets->pull(0);
|
$header = $sheets->pull(0);
|
||||||
$posts = Sheets::collection($header, $sheets);
|
$posts = Sheets::collection($header, $sheets);
|
||||||
@ -118,7 +118,7 @@
|
|||||||
|
|
||||||
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
$sheets = Sheets::spreadsheet('1c2Uv3QVTyLzsJPE4uqqlMGNKO8z0Kqj6aEGh0uixAqA')
|
||||||
->sheet('Platform')
|
->sheet('Platform')
|
||||||
->range('A:F')
|
->range('A:G')
|
||||||
->get();
|
->get();
|
||||||
$header = $sheets->pull(0);
|
$header = $sheets->pull(0);
|
||||||
$posts = Sheets::collection($header, $sheets);
|
$posts = Sheets::collection($header, $sheets);
|
||||||
|
@ -102,6 +102,7 @@
|
|||||||
<th scope="col" class="px-6 py-3">Platform</th>
|
<th scope="col" class="px-6 py-3">Platform</th>
|
||||||
<th scope="col" class="px-6 py-3">Kategori</th>
|
<th scope="col" class="px-6 py-3">Kategori</th>
|
||||||
<th scope="col" class="px-6 py-3">Nama</th>
|
<th scope="col" class="px-6 py-3">Nama</th>
|
||||||
|
<th scope="col" class="px-6 py-3">Stok</th>
|
||||||
<th scope="col" class="px-6 py-3">Harga</th>
|
<th scope="col" class="px-6 py-3">Harga</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -119,6 +120,7 @@
|
|||||||
$harga = str_replace('.00','',$harga);
|
$harga = str_replace('.00','',$harga);
|
||||||
$harga = str_replace(',','',$harga);
|
$harga = str_replace(',','',$harga);
|
||||||
@endphp
|
@endphp
|
||||||
|
<td class="px-6 py-4">{{ $row['Stok'] }}</td>
|
||||||
<td class="px-6 py-4">Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }}</td>
|
<td class="px-6 py-4">Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@php $no++; @endphp
|
@php $no++; @endphp
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Kerjasama Penelitian Genomik Panin 2023</title>
|
<title>ONT | Kerjasama Penelitian Genomik Panin 2023</title>
|
||||||
|
|
||||||
<!-- Meta SEO -->
|
<!-- Meta SEO -->
|
||||||
<meta name="title" content="Kerjasama Penelitian Genomik Panin 2023">
|
<meta name="title" content="ONT | Kerjasama Penelitian Genomik Panin 2023">
|
||||||
<meta name="description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
<meta name="description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
||||||
<meta name="robots" content="index, follow">
|
<meta name="robots" content="index, follow">
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<meta name="author" content="Yayasan Satriabudi Dharma Setia">
|
<meta name="author" content="Yayasan Satriabudi Dharma Setia">
|
||||||
|
|
||||||
<!-- Social media share -->
|
<!-- Social media share -->
|
||||||
<meta property="og:title" content="Kerjasama Penelitian Genomik Panin 2023">
|
<meta property="og:title" content="ONT | Kerjasama Penelitian Genomik Panin 2023">
|
||||||
<meta property="og:site_name" content="Yayasan Satriabudi Dharma Setia">
|
<meta property="og:site_name" content="Yayasan Satriabudi Dharma Setia">
|
||||||
<meta property="og:url" content=https://genom.dharma.or.id">
|
<meta property="og:url" content=https://genom.dharma.or.id">
|
||||||
<meta property="og:description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
<meta property="og:description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
||||||
@ -61,6 +61,12 @@
|
|||||||
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}"
|
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}"
|
||||||
aria-current="page">Home</a>
|
aria-current="page">Home</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="{{ URL::to('/press-release') }}" @click="activeMenu='pressrelease'"
|
||||||
|
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:b>
|
||||||
|
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='pressrelease'}">Press Release</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ URL::to('/#cakupan') }}" @click="activeMenu='cakupan'"
|
<a href="{{ URL::to('/#cakupan') }}" @click="activeMenu='cakupan'"
|
||||||
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
||||||
@ -126,6 +132,7 @@
|
|||||||
<th scope="col" class="px-6 py-3">Platform</th>
|
<th scope="col" class="px-6 py-3">Platform</th>
|
||||||
<th scope="col" class="px-6 py-3">Kategori</th>
|
<th scope="col" class="px-6 py-3">Kategori</th>
|
||||||
<th scope="col" class="px-6 py-3">Nama</th>
|
<th scope="col" class="px-6 py-3">Nama</th>
|
||||||
|
<th scope="col" class="px-6 py-3">Stok</th>
|
||||||
<th scope="col" class="px-6 py-3">Harga</th>
|
<th scope="col" class="px-6 py-3">Harga</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -143,6 +150,7 @@
|
|||||||
$harga = str_replace('.00','',$harga);
|
$harga = str_replace('.00','',$harga);
|
||||||
$harga = str_replace(',','',$harga);
|
$harga = str_replace(',','',$harga);
|
||||||
@endphp
|
@endphp
|
||||||
|
<td class="px-6 py-4">{{ $row['Stok'] }}</td>
|
||||||
<td class="px-6 py-4">Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }}</td>
|
<td class="px-6 py-4">Rp {{ number_format($harga*($usd+($usd*0.05)),2,',','.') }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@php $no++; @endphp
|
@php $no++; @endphp
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Kerjasama Penelitian Genomik Panin 2023</title>
|
<title>Press Release | Kerjasama Penelitian Genomik Panin 2023</title>
|
||||||
|
|
||||||
<!-- Meta SEO -->
|
<!-- Meta SEO -->
|
||||||
<meta name="title" content="Kerjasama Penelitian Genomik Panin 2023">
|
<meta name="title" content="Press Release | Kerjasama Penelitian Genomik Panin 2023">
|
||||||
<meta name="description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
<meta name="description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
||||||
<meta name="robots" content="index, follow">
|
<meta name="robots" content="index, follow">
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<meta name="author" content="Yayasan Satriabudi Dharma Setia">
|
<meta name="author" content="Yayasan Satriabudi Dharma Setia">
|
||||||
|
|
||||||
<!-- Social media share -->
|
<!-- Social media share -->
|
||||||
<meta property="og:title" content="Kerjasama Penelitian Genomik Panin 2023">
|
<meta property="og:title" content="Press Release | Kerjasama Penelitian Genomik Panin 2023">
|
||||||
<meta property="og:site_name" content="Yayasan Satriabudi Dharma Setia">
|
<meta property="og:site_name" content="Yayasan Satriabudi Dharma Setia">
|
||||||
<meta property="og:url" content=https://genom.dharma.or.id">
|
<meta property="og:url" content=https://genom.dharma.or.id">
|
||||||
<meta property="og:description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
<meta property="og:description" content="Yayasan Satriabudi Dharma Setia (YSDS) mengundang peneliti-peneliti Indonesia yang memiliki penelitian dengan metode pemeriksaan genome sequencing, untuk dapat menggunakan fasilitas kerjasama bahan habis pakai">
|
||||||
@ -54,13 +54,19 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="items-center justify-between hidden w-full lg:flex lg:w-auto lg:order-1" id="mobile-menu-2">
|
<div class="items-center justify-between hidden w-full lg:flex lg:w-auto lg:order-1" id="mobile-menu-2">
|
||||||
<ul class="flex flex-col mt-4 font-medium lg:flex-row lg:space-x-8 lg:mt-0" x-data="{ activeMenu: 'home' }">
|
<ul class="flex flex-col mt-4 font-medium lg:flex-row lg:space-x-8 lg:mt-0" x-data="{ activeMenu: 'pressrelease' }">
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ URL::to('/') }}" @click="activeMenu='home'"
|
<a href="{{ URL::to('/') }}" @click="activeMenu='home'"
|
||||||
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
||||||
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}"
|
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='home'}"
|
||||||
aria-current="page">Home</a>
|
aria-current="page">Home</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="{{ URL::to('/press-release') }}" @click="activeMenu='pressrelease'"
|
||||||
|
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:b>
|
||||||
|
:class="{'text-white bg-guardsman-red-700 rounded lg:bg-transparent lg:text-guardsman-red-700 dark:text-white' : activeMenu=='pressrelease'}">Press Release</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ URL::to('/#cakupan') }}" @click="activeMenu='cakupan'"
|
<a href="{{ URL::to('/#cakupan') }}" @click="activeMenu='cakupan'"
|
||||||
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
class="block py-2 pl-3 pr-4 text-gray-700 border-b border-gray-100 hover:bg-mallard-50 lg:hover:bg-transparent lg:border-0 lg:hover:text-guardsman-red-700 lg:p-0 dark:text-gray-400 lg:dark:hover:text-white dark:hover:bg-mallard-700 dark:hover:text-white lg:dark:hover:bg-transparent dark:border-gray-700"
|
||||||
|
Loading…
Reference in New Issue
Block a user