working on PCB supervisor v1.5

parent 6190e43c
...@@ -15,6 +15,7 @@ android { ...@@ -15,6 +15,7 @@ android {
resValue "string", "core_vocabulary", "core_vocabulary" resValue "string", "core_vocabulary", "core_vocabulary"
resValue "string", "apk", "to_be_set_in_subproject" resValue "string", "apk", "to_be_set_in_subproject"
resValue "string", "VersionManagerClass", "to_be_set_in_subproject" resValue "string", "VersionManagerClass", "to_be_set_in_subproject"
resValue "string", "login_web", "https://login.pictogramweb.com"
} }
buildTypes { buildTypes {
release { release {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<string name="noInternetConnection">No hay acceso al Servidor. Inténtelo más tarde</string> <string name="noInternetConnection">No hay acceso al Servidor. Inténtelo más tarde</string>
<string name="exitingApp">Saliendo de la aplicación</string> <string name="exitingApp">Saliendo de la aplicación</string>
<string name="serverError">Fallo accediendo al Servidor. Inténtelo más tarde</string> <string name="serverError">Fallo accediendo al Servidor. Inténtelo más tarde</string>
<string name="firstlogin">Por favor, introduzca su usuario y clave, o bien registrese en </string> <string name="firstlogin">Por favor, introduzca su usuario y clave, o bien regístrese en </string>
<string name="addStudent">Añadir estudiante</string> <string name="addStudent">Añadir estudiante</string>
<string name="getLicenseStudent">Por favor, introduzca el número de licencia del estudiante</string> <string name="getLicenseStudent">Por favor, introduzca el número de licencia del estudiante</string>
<!--Semantic grammar --> <!--Semantic grammar -->
......
...@@ -17,6 +17,7 @@ import android.widget.Button; ...@@ -17,6 +17,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.yottacode.pictogram.dao.Device; import com.yottacode.pictogram.dao.Device;
...@@ -202,8 +203,15 @@ public class SerialActivity extends Activity { ...@@ -202,8 +203,15 @@ public class SerialActivity extends Activity {
users = PCBcontext.getDevice().getUsers(); users = PCBcontext.getDevice().getUsers();
createListSup(users); createListSup(users);
createListStu(users); createListStu(users);
if (username.equals("") && users.size()==0) if (username.equals("") && users.size()==0) {
GUITools.show_alert(this, R.string.firstlogin,this.getString(R.string.server)); ((TextView) findViewById(R.id.txt_firstlogin)).append('\n' + getString(R.string.login_web));
findViewById(R.id.firstlogin).setVisibility(View.VISIBLE);
findViewById(R.id.supstulist).setVisibility(View.GONE);
}
else {
findViewById(R.id.firstlogin).setVisibility(View.GONE);
findViewById(R.id.supstulist).setVisibility(View.VISIBLE);
}
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
Log.e(this.getClass().getCanonicalName(), e.getMessage()); Log.e(this.getClass().getCanonicalName(), e.getMessage());
......
...@@ -110,14 +110,31 @@ ...@@ -110,14 +110,31 @@
android:src="@drawable/login_image" /> android:src="@drawable/login_image" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal"
android:id="@+id/firstlogin">
<TextView
android:id="@+id/txt_firstlogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/VerdeApp"
android:text="@string/firstlogin"
android:textAlignment="center"
android:textColor="@color/BlancoApp"
android:textSize="18sp"
tools:text="Alumnos" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:orientation="horizontal"
android:id="@+id/supstulist">
<LinearLayout <LinearLayout
android:id="@+id/stuLay" android:id="@+id/stuLay"
android:layout_width="285dp" android:layout_width="285dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment