diff --git a/app/src/main/java/com/seadev/kampungsiagacovid/ui/SurveyActivity.kt b/app/src/main/java/com/seadev/kampungsiagacovid/ui/SurveyActivity.kt
index 9e843a8..a3fe01a 100644
--- a/app/src/main/java/com/seadev/kampungsiagacovid/ui/SurveyActivity.kt
+++ b/app/src/main/java/com/seadev/kampungsiagacovid/ui/SurveyActivity.kt
@@ -1,15 +1,20 @@
 package com.seadev.kampungsiagacovid.ui
 
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.room.Room
+import com.bumptech.glide.Glide
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
 import com.quickbirdstudios.surveykit.*
@@ -19,13 +24,18 @@ import com.quickbirdstudios.surveykit.steps.InstructionStep
 import com.quickbirdstudios.surveykit.steps.QuestionStep
 import com.quickbirdstudios.surveykit.steps.Step
 import com.quickbirdstudios.surveykit.survey.SurveyView
+import com.seadev.kampungsiagacovid.BuildConfig
 import com.seadev.kampungsiagacovid.R
 import com.seadev.kampungsiagacovid.model.Asesmen
 import com.seadev.kampungsiagacovid.model.DataQuestionTitle
 import com.seadev.kampungsiagacovid.room.AsesmenContract.db
+import com.seadev.kampungsiagacovid.room.AssesmenDatabase
 import com.seadev.kampungsiagacovid.util.DateFormater
+import com.seadev.kampungsiagacovid.util.ReportHistoryFormater
+import kotlinx.android.synthetic.main.activity_survey.*
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.*
 
 class SurveyActivity : AppCompatActivity() {
 
@@ -40,24 +50,89 @@ class SurveyActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_survey)
         supportActionBar?.title = "Koesioner Penilaian Diri"
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        survey = findViewById(R.id.survey_view)
-        survey.onCancelPendingInputEvents()
-        container = findViewById(R.id.surveyContainer)
-        initialQuestion()
-        setupSurvey(survey)
+//        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        initView()
+    }
+
+    private fun initView() {
+        db = Room.databaseBuilder(Objects.requireNonNull(this),
+                AssesmenDatabase::class.java, "db_asesmen").allowMainThreadQueries().build()
+        val asesmenList = db.asesmenDao().dataAsesmen
+        if (!asesmenList.isEmpty()) {
+            val (date1) = asesmenList[asesmenList.size - 1]
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy")
+                val nowDate = LocalDateTime.now().format(formatter)
+                val isToday = if (nowDate == date1) 1 else 0
+                if (isToday == 1) {
+                    layoutScroll.visibility = View.VISIBLE
+                    layoutDoneSurvey.visibility = View.VISIBLE
+                    layoutGuideSurvey.visibility = View.GONE
+                    btnSurveyBack.setOnClickListener { finish() }
+                    Glide.with(this)
+                            .load(BuildConfig.BASE_URL_LOKASI + getString(R.string.res_icon_assesment))
+                            .into(ivImgDoneSurvey)
+                } else {
+                    Glide.with(this)
+                            .load(BuildConfig.BASE_URL_LOKASI + "res%2F068-settings.png?alt=media&token=700c2e17-e8d0-4ef5-b9a6-9a8804e1e294")
+                            .into(ivImgGuideSurvey)
+                    btnGuideOK.setOnClickListener {
+                        layoutScroll.visibility = View.GONE
+                        layoutDoneSurvey.visibility = View.GONE
+                        layoutGuideSurvey.visibility = View.GONE
+                        survey_view.visibility = View.VISIBLE
+                        survey = findViewById(R.id.survey_view)
+                        survey.onCancelPendingInputEvents()
+                        container = findViewById(R.id.surveyContainer)
+                        initialQuestion()
+                        setupSurvey(survey)
+
+                    }
+
+                }
+            }
+        } else {
+            Glide.with(this)
+                    .load(BuildConfig.BASE_URL_LOKASI + "res%2F068-settings.png?alt=media&token=700c2e17-e8d0-4ef5-b9a6-9a8804e1e294")
+                    .into(ivImgGuideSurvey)
+            btnGuideOK.setOnClickListener {
+                layoutScroll.visibility = View.GONE
+                layoutDoneSurvey.visibility = View.GONE
+                layoutGuideSurvey.visibility = View.GONE
+                survey_view.visibility = View.VISIBLE
+                survey = findViewById(R.id.survey_view)
+                survey.onCancelPendingInputEvents()
+                container = findViewById(R.id.surveyContainer)
+                initialQuestion()
+                setupSurvey(survey)
+
+            }
+        }
     }
 
     override fun onBackPressed() {
-        super.onBackPressed()
-        finish()
+        onBack()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) finish()
+        if (item.itemId == android.R.id.home) onBack()
         return super.onOptionsItemSelected(item)
     }
 
+    private fun onBack() {
+        val builder = AlertDialog.Builder(this)
+        builder.setMessage("Jika Anda keluar, data yang Anda isi akan di abaikan.")
+                .setPositiveButton("Ya") { dialog, which ->
+                    survey.onSurveyFinish
+                    survey.removeAllViews()
+                    container.removeAllViews()
+                    finish()
+                }
+                .setNegativeButton("Batal") { dialog, which -> }
+        builder.setTitle("Apakah Anda yakin ingin keluar dari penilaian diri sekarang?")
+        builder.create().show()
+    }
+
     private fun setupSurvey(surveyView: SurveyView) {
         val steps = mStep
         val task = NavigableOrderedTask(steps = steps)
@@ -122,7 +197,7 @@ class SurveyActivity : AppCompatActivity() {
         }
 
         mStep.add(InstructionStep(
-                title = R.string.intro_title,
+                title = R.string.intro_title_2,
                 text = R.string.intro_text_2,
                 buttonText = R.string.intro_start))
 
@@ -141,7 +216,7 @@ class SurveyActivity : AppCompatActivity() {
         }
 
         mStep.add(InstructionStep(
-                title = R.string.intro_title,
+                title = R.string.intro_title_3,
                 text = R.string.intro_text_3,
                 buttonText = R.string.intro_start))
 
@@ -230,6 +305,10 @@ class SurveyActivity : AppCompatActivity() {
                 }
         dataAsesmen.date = datePath
         db.asesmenDao().InsertDataAsesmen(dataAsesmen)
+        val intent = Intent(this, DetailReportActivity::class.java)
+        intent.putExtra(DetailReportActivity.DATA_DETAIL_EXTRA, ReportHistoryFormater
+                .getTitleReport(dataAsesmen.risiko!!).toLowerCase() + " result")
+        startActivity(intent)
         finish()
     }
 }
diff --git a/app/src/main/res/layout/activity_survey.xml b/app/src/main/res/layout/activity_survey.xml
index 4a7e39f..233f993 100644
--- a/app/src/main/res/layout/activity_survey.xml
+++ b/app/src/main/res/layout/activity_survey.xml
@@ -1,14 +1,234 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/surveyContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/layoutScroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:layout_editor_absoluteX="0dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/layoutDoneSurvey"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:padding="32dp"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/ivImgDoneSurvey"
+                    android:layout_width="200dp"
+                    android:layout_height="200dp"
+                    android:layout_above="@id/tvDone1"
+                    android:layout_centerHorizontal="true"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    android:padding="16dp"
+                    android:src="@drawable/ic_forground" />
+
+                <TextView
+                    android:id="@+id/tvDone1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_above="@id/tvDone2"
+                    android:text="Anda telah selesai mengisi penilaian diri hari ini."
+                    android:textAlignment="center"
+                    android:textColor="@color/colorPrimaryDark"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tvDone2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:layout_marginTop="16dp"
+                    android:text="Ikuti langkah-langkah dari hasil yang telah Anda dapatkan hari ini, jaga kesehatan selalu."
+                    android:textAlignment="center"
+                    android:textColor="@color/color_text_2"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tvDone3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tvDone2"
+                    android:text="Jangan lupa untuk mengisi penilaian diri setiap hari."
+                    android:textAlignment="center"
+                    android:textColor="@color/color_text_2" />
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tvDone3"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    app:cardBackgroundColor="@color/colorAccent"
+                    app:cardCornerRadius="26dp"
+                    app:cardUseCompatPadding="true">
+
+                    <TextView
+                        android:id="@+id/btnSurveyBack"
+                        style="@style/ItemsTouchable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="36dp"
+                        android:paddingTop="16dp"
+                        android:paddingEnd="36dp"
+                        android:paddingBottom="16dp"
+
+                        android:text="Kembali"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                </androidx.cardview.widget.CardView>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layoutGuideSurvey"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:padding="32dp"
+                android:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/ivImgGuideSurvey"
+                    android:layout_width="200dp"
+                    android:layout_height="200dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    android:padding="16dp"
+                    android:src="@drawable/ic_forground" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Petunjuk"
+                    android:textColor="@color/colorPrimaryDark"
+                    android:textSize="22dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="16dp"
+                    android:text="Pada kuesioner ini terdapat 3 langkah pertanyaan yang akan Anda isi, berikut penjelasannya"
+                    android:textAlignment="center"
+                    android:textColor="@color/color_text_1"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:text="Langkah 1"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Pertanyaan potensi tertular di luar rumah"
+                    android:textColor="@color/color_text_1" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:text="Langkah 2"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Pertanyaan potensi tertular di dalam Rumah"
+                    android:textColor="@color/color_text_1" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:text="Langkah 3"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Pertanyaan daya tahan tubuh"
+                    android:textColor="@color/color_text_1" />
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="16dp"
+                    app:cardBackgroundColor="@color/colorAccent"
+                    app:cardCornerRadius="26dp"
+                    app:cardUseCompatPadding="true">
+
+                    <TextView
+                        android:id="@+id/btnGuideOK"
+                        style="@style/ItemsTouchable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="36dp"
+                        android:paddingTop="16dp"
+                        android:paddingEnd="36dp"
+                        android:paddingBottom="16dp"
+                        android:text="Mengerti"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                </androidx.cardview.widget.CardView>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
     <com.quickbirdstudios.surveykit.survey.SurveyView
-        android:padding="16dp"
+        android:layout_height="match_parent"
         android:id="@+id/survey_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:padding="16dp"
+        android:visibility="gone" />
+
 
 </LinearLayout>