Modificata maschera dello Spreadsheet: campo codice indirizzo, comune.

Modificato campo ricerca alternativa.


git-svn-id: svn://10.65.10.50/trunk@205 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg0200.cpp

@@ -366,7 +366,6 @@ int CG0200_application::read(TMask& m)
   {
     TRectype& rec=_rel->indirizzo(i);
     riga.cut(0);
-    riga.add(rec.get("CODIND"));
     riga.add(rec.get("RAGSOC"));
     riga.add(rec.get("INDIR"));
     riga.add(rec.get("CIV"));
@@ -379,6 +378,7 @@ int CG0200_application::read(TMask& m)
     riga.add(rec.get("PFAX"));
     riga.add(rec.get("FAX"));
     riga.add(rec.get("IVARID"));
+    riga.add(rec.get("CODIND"));
     indsp_sheet().row(i)=riga;
   }
   return _rel->status();
@@ -433,7 +433,6 @@ void CG0200_application::common_f(const TMask& m)
     rec.zero();
     rec.put("TIPOCF",tipocf);
     rec.put("CODCF",codcf);
-    rec.put("CODIND",row.get_long());
     rec.put("RAGSOC",row.get());
     rec.put("INDIR",row.get());
     rec.put("CIV",row.get());
@@ -446,6 +445,7 @@ void CG0200_application::common_f(const TMask& m)
     rec.put("PFAX",row.get());
     rec.put("FAX",row.get());
     rec.put("IVARID",row.get());
+    rec.put("CODIND",(long)(i+1));
   }
 }
 
@@ -455,30 +455,29 @@ bool CG0200_application::indsp_notify(int r, KEY key)
 
   switch (key)
   {
-  case K_DEL:
-    // Request to delete the row #r
-    // I need an empty record; leave only TIPOCF CODCF & CODIND 
-    // so it returns FALSE because I don't want it to remove this row
-    // see cg0200b.uml; avoided K_DEL, sent K_ENTER instead.
-    return FALSE;
-    break;
   case K_SPACE: 
     // Request to modify row #r
     // Disable field # 101 (CODIND) update # of row
     TMask& m = indsp.sheet_mask();
 
-    if (m.get_int(101)==0)  // Is it a new row ?
+    if (m.get_int(114)==0)  // Is it a new row ?
-      m.set(101,(long)indsp.items());
+      m.set(114,(long)(r+1));
-    m.disable(101);
+    m.disable(114);
     break;
   case K_INS: 
     // request to add the row #r
     // To avoid rewriting of existing record.
-    if (indsp.items() == 999)
+    if (indsp.items() >= 999)
     {
       error_box("Raggiunto il numero massimo degli indirizzi per questo C/F");
       return FALSE; // Refuse Permission
-    }
+    } else
+      // To avoid inserts in the middle of the sheet
+      if (indsp.items()>r)
+      {
+        error_box("Si possono aggiungere indirizzi solo alla fine");
+        return FALSE;  //Refuse permission
+      }
     break;
   default:
     break;

cg/cg0200b.uml

@@ -1,75 +1,71 @@
 #include "cg0200.h"
 
-PAGE "" -1 -1 74 16
+PAGE "" -1 -1 76 16
 
-NUMBER 101 3
+STRING 101 50 
-BEGIN
-  PROMPT 1 1 "Codice    "
-END
-
-STRING 102 50 
 BEGIN
   PROMPT 1 2 "Rag. soc. "
   HELP "Inserire la ragione sociale"
 	GROUP 1
 END
 
-STRING 103 35
+STRING 102 35
 BEGIN
   PROMPT 1 4 "Indirizzo "
   HELP "Inserire l'indirizzo"
 	GROUP 1
 END
 
-STRING 104 10
+STRING 103 10
 BEGIN
-  PROMPT 54 4 "N.     "
+  PROMPT 54 4 "N.       "
   HELP "Inserire il numero civico"
 	GROUP 1
 END
 
-STRING 105 35
+STRING 104 35
 BEGIN
   PROMPT 1 5 "Localita  "
   HELP "Inserire la localita"
 	GROUP 1
 END
 
-STRING 106 5
+STRING 105 5
 BEGIN
-  PROMPT 54 5 "CAP    "
+  PROMPT 54 5 "CAP      "
   HELP "Inserire il Codice di Avviamento Postale"
 	GROUP 1
 END
 
-NUMBER 107 3
+NUMBER 106 3
 BEGIN
   PROMPT 1 6 "Stato     "
   FLAGS "RZ"
   USE %STA
-  INPUT CODTAB 107
+  INPUT CODTAB 106
   DISPLAY "Codice" CODTAB
   DISPLAY "Stato@50" S0
-  OUTPUT 107 CODTAB
+  OUTPUT 106 CODTAB
   CHECKTYPE NORMAL
   WARNING "Stato assente"
   HELP "Inserire il codice dello stato"
 	GROUP 1
 END
 
-STRING 108 4
+STRING 107 4
 BEGIN
-  PROMPT 54 6 "Comune "
+  PROMPT 18 6 "Comune "
   FLAGS "U"
   USE LF_COMUNI
-  INPUT STATO 107
+  INPUT STATO 106
-  INPUT COM 108
+  INPUT COM 107
   DISPLAY "Stato" STATO
   DISPLAY "Codice" COM
   DISPLAY "Comune@50" DENCOM
-  OUTPUT 107 STATO
+  OUTPUT 105 CAPCOM
-  OUTPUT 108 COM
+  OUTPUT 106 STATO
-  OUTPUT 106 CAPCOM
+  OUTPUT 107 COM
+  OUTPUT 108 DENCOM
   CHECKTYPE NORMAL
   WARNING "Comune assente"
   ADD MASK ba4100a
@@ -77,6 +73,19 @@ BEGIN
 	GROUP 1
 END
 
+STRING 108 40
+BEGIN
+  PROMPT 33 6 ""
+  USE LF_COMUNI KEY 2
+  INPUT DENCOM 108
+  DISPLAY "Comune@50" DENCOM
+  DISPLAY "Stato" STATO
+  DISPLAY "Codice" COM
+  COPY OUTPUT 107
+  ADD MASK ba4100a
+	GROUP 1
+END
+
 GROUPBOX DLG_NULL 72 4
 BEGIN
 	PROMPT 1 8 "Numeri Telefonici"
@@ -115,6 +124,11 @@ BEGIN
 	GROUP 1
 END
 
+NUMBER 114 3
+BEGIN
+  PROMPT 1 1 "Codice    "
+END
+
 BUTTON DLG_OK 9 2
 BEGIN
   PROMPT -13 -1 ""
@@ -127,7 +141,7 @@ END
 
 BUTTON DLG_NULL 9 2
 BEGIN
-	PROMPT -33 -1 "Elimina"
+	PROMPT -33 -1 "A~zzera"
 	MESSAGE RESET,1@
 	MESSAGE EXIT,K_ENTER
 END