Merge pull request #124 from OpenEVSE/rapi_dev_screen_improvents

Display RAPI error messages

Author: jeremypoulter

src/components/blocks/configuration/Dev.svelte

@@ -50,7 +50,7 @@
 		if (res=="error") {
 			button_send_state = "error"
 			return false
-		} 
+		}
 		else {
 			button_send_state = "ok"
 			rapi_cmd_result.push(res)
@@ -69,7 +69,7 @@
 		button_export_state = "loading"
 		// get usefull data
 		let data = {}
-		
+
 		// copy stores
 		data.target = {...$claims_target_store}
 		// get claims store not cached here
@@ -85,7 +85,7 @@
 		data.config = {...$config_store}
 		data.limits = {...$limit_store}
 		data.tesla = {...$tesla_store}
-		
+
 		data.uistates = {...$uistates_store}
 
 
@@ -119,9 +119,10 @@
 					<div class="mb-2">
 						<div>
 							<div class="is-size-7 has-text-left my-2 mx-2">
-							{#each rapi_cmd_result as { cmd, ret } }
-							&gt; {cmd} <br>
-							&lt; {ret} <br>
+							{#each rapi_cmd_result as { cmd, ret, error } }
+							&gt; <span class="rapi-cmd">{cmd}</span><br>
+							&lt; {#if ret !== undefined}<span class="rapi-res">{ret}</span>{/if}
+              {#if error !== undefined}<span class="rapi-error">{error}</span>{/if} <br>
 							{/each}
 							</div>
 							<form on:submit|preventDefault={send_rapi_cmd}>
@@ -153,4 +154,4 @@
 	{#if opened}
 	<Terminal mode={mode} bind:opened={opened}/>
 	{/if}
-<!-- </Modal> -->
+<!-- </Modal> -->

src/lib/i18n/en.json

@@ -484,7 +484,7 @@
             "missing-ohm": "Ohm Key is missing"
         },
         "dev": {
-            "rapi-cmd": "Rapi Commands",
+            "rapi-cmd": "RAPI Commands",
             "send": "Send",
             "clear": "Clear",
             "consoles": "Consoles",
@@ -510,4 +510,4 @@
             "missing-ocpp_idtag": "missing Id Tag"
         }
     }
-}
+}

src/lib/i18n/es.json

@@ -484,7 +484,7 @@
 			"missing-ohm": "Falta Clave Ohm"
 		},
 		"dev": {
-			"rapi-cmd": "Comando Rapi",
+			"rapi-cmd": "Comando RAPI",
 			"send": "enviar",
 			"clear": "Limpiar",
 			"consoles": "Consolas",

src/lib/i18n/fr.json

@@ -485,7 +485,7 @@
             "missing-ohm": "Clef Ohm manquante"
         },
         "dev": {
-            "rapi-cmd": "Commandes Rapi",
+            "rapi-cmd": "Commandes RAPI",
             "send": "Envoyer",
             "clear": "Effacer",
             "consoles": "Consoles",

src/mystyles.scss

@@ -37,7 +37,7 @@ $body-color: $dark;
 @import "../node_modules/bulma/sass/grid/_all";
 @import "../node_modules/bulma/sass/helpers/_all";
 @import "../node_modules/bulma/sass/utilities/_all";
-@import "../node_modules/bulma/sass/components/level";	
+@import "../node_modules/bulma/sass/components/level";
 @import "../node_modules/bulma/sass/components/modal";
 @import "../node_modules/bulma/sass/components/tabs";
 @import "../node_modules/bulma/sass/components/message";
@@ -64,7 +64,7 @@ $breadcrumb-item-color: $text;
 	box-sizing: border-box;
   }
 
-  
+
 // body::-webkit-scrollbar { display: none; }
 
 
@@ -89,7 +89,7 @@ html {
 ::-webkit-scrollbar {
 	width: 8px;
   }
-  
+
   /* Track */
 ::-webkit-scrollbar-track {
 	background: none;
@@ -98,16 +98,16 @@ html {
 
 ::-webkit-scrollbar-track:hover {
 	background: #fbf9ed;
-	
+
 }
-	
-  
+
+
   /* Handle */
 ::-webkit-scrollbar-thumb {
 	// background: hsl(189, 53%, 47%);
 	background:  #32b3d4;;
 	border-radius: 8px;
-	
+
 }
 
 @media screen and (max-width: 768px){
@@ -123,3 +123,14 @@ scrollbar-color: hsl(189, 53%, 47%) white;
 scrollbar-width: thin;
 }
 
+.rapi-cmd {
+  color: $cyan;
+}
+
+.rapi-res {
+  color: $green;
+}
+
+.rapi-error {
+  color: #cc0f35;
+}