From f9118709c422184f50a3f020b76701b4271ac5b6 Mon Sep 17 00:00:00 2001
From: "mikep%oeone.com" <mikep%oeone.com>
Date: Mon, 16 Sep 2002 14:34:27 +0000
Subject: [PATCH] Fixing status problems in to do dialogs, bug 168500

---
 .../resources/content/calendarToDoDialog.js   | 42 +++++++++----------
 .../resources/content/calendarToDoDialog.xul  | 11 +----
 calendar/resources/content/toDoDialog.js      | 42 +++++++++----------
 calendar/resources/content/toDoDialog.xul     | 11 +----
 calendar/resources/locale/en-US/calendar.dtd  |  2 +
 5 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/calendar/resources/content/calendarToDoDialog.js b/calendar/resources/content/calendarToDoDialog.js
index ddf84e3b2dd..1834bcbe02f 100644
--- a/calendar/resources/content/calendarToDoDialog.js
+++ b/calendar/resources/content/calendarToDoDialog.js
@@ -152,20 +152,11 @@ function loadCalendarToDoDialog()
    setFieldValue( "title-field", gToDo.title  );
    setFieldValue( "description-field", gToDo.description );
    setFieldValue( "uri-field", gToDo.url );
-
+   
    switch( gToDo.status )
    {
-      case gToDo.ICAL_STATUS_NEEDSACTION:
-         setFieldValue( "status-field", "ICAL_STATUS_NEEDSACTION" );
-      break;
-      case gToDo.ICAL_STATUS_INPROGRESS:
-         setFieldValue( "status-field", "ICAL_STATUS_INPROGRESS" );
-      break;
-      case gToDo.ICAL_STATUS_COMPLETED:
-         setFieldValue( "status-field", "ICAL_STATUS_COMPLETED" );
-      break;
       case gToDo.ICAL_STATUS_CANCELLED:
-         setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
+         setFieldValue( "cancelled-checkbox", true, "checked" );
       break;
    }
    
@@ -243,9 +234,7 @@ function onOKCommand()
    
    gToDo.title       = getFieldValue( "title-field" );
    gToDo.description = getFieldValue( "description-field" );
-   if( getFieldValue( "status-field" ) != "" )
-      gToDo.status      = eval( "gToDo."+getFieldValue( "status-field" ) );
-
+   
    var dueDate = getDateTimeFieldValue( "due-date-text" );
    gToDo.due.year = dueDate.getYear()+1900;
    gToDo.due.month = dueDate.getMonth();
@@ -275,6 +264,7 @@ function onOKCommand()
 
    var percentcomplete = getFieldValue( "percent-complete-menulist" );
    percentcomplete =  parseInt( percentcomplete );
+   
    if(percentcomplete > 100)
       percentcomplete = 100;
    else if(percentcomplete < 0)
@@ -293,18 +283,23 @@ function onOKCommand()
       gToDo.status = gToDo.ICAL_STATUS_COMPLETED;
    }
    else
+   {
       gToDo.completed.clear();
-      if (percentcomplete == 0)
-         gToDo.status = gToDo.ICAL_STATUS_NEEDSACTION;
-      else
+      
+      var cancelled = getFieldValue( "cancelled-checkbox", "checked" );
+      
+      if( cancelled )
+         gToDo.status = gToDo.ICAL_STATUS_CANCELLED;
+      else if (percentcomplete > 0)
          gToDo.status = gToDo.ICAL_STATUS_INPROCESS;
-
-
-   dump( "!!!-->in calendarEventDialog.js, alarmUnits is "+gToDo.alarmUnits );
+      else
+         gToDo.status = gToDo.ICAL_STATUS_NEEDSACTION;
+   }
+   
+   
    if ( getFieldValue( "alarm-email-checkbox", "checked" ) ) 
    {
       gToDo.alarmEmailAddress = getFieldValue( "alarm-email-field", "value" );
-      dump( "!!!-->in calendarEventDialog.js, alarmEmailAddress is "+gToDo.alarmEmailAddress );
    }
    else
    {
@@ -627,7 +622,10 @@ function getFieldValue( elementId, propertyName )
    }
    else
    {
-      return field.value;
+      if( field )
+         return field.value;
+      else
+         alert( elementId );
    }
 }
 
diff --git a/calendar/resources/content/calendarToDoDialog.xul b/calendar/resources/content/calendarToDoDialog.xul
index 5fe2309d8f4..cf2c74d470a 100644
--- a/calendar/resources/content/calendarToDoDialog.xul
+++ b/calendar/resources/content/calendarToDoDialog.xul
@@ -249,16 +249,9 @@
                     <!-- Task Status -->
                     <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label value="Event Status"/>
+                            <label value="&newtodo.status.label;"/>
                         </hbox>
-                        <menulist id="status-field" label="&newevent.status.label;">
-                            <menupopup id="status-menulist-menupopup">
-                                <menuitem label="&newevent.status.needsaction.label;"  value="ICAL_STATUS_NEEDSACTION"/>
-										  <menuitem label="&newevent.status.inprogress.label;"  value="ICAL_STATUS_INPROGRESS"/>
-										  <menuitem label="&newevent.status.completed.label;"  value="ICAL_STATUS_COMPLETED"/>
-                                <menuitem label="&newevent.status.cancelled.label;"  value="ICAL_STATUS_CANCELLED"/>
-                            </menupopup>
-                        </menulist>
+                        <checkbox id="cancelled-checkbox"  label="&newtodo.cancelled.label;" checked="false"/>
                     </row>
                     
                     <!-- Categories -->    
diff --git a/calendar/resources/content/toDoDialog.js b/calendar/resources/content/toDoDialog.js
index ddf84e3b2dd..1834bcbe02f 100644
--- a/calendar/resources/content/toDoDialog.js
+++ b/calendar/resources/content/toDoDialog.js
@@ -152,20 +152,11 @@ function loadCalendarToDoDialog()
    setFieldValue( "title-field", gToDo.title  );
    setFieldValue( "description-field", gToDo.description );
    setFieldValue( "uri-field", gToDo.url );
-
+   
    switch( gToDo.status )
    {
-      case gToDo.ICAL_STATUS_NEEDSACTION:
-         setFieldValue( "status-field", "ICAL_STATUS_NEEDSACTION" );
-      break;
-      case gToDo.ICAL_STATUS_INPROGRESS:
-         setFieldValue( "status-field", "ICAL_STATUS_INPROGRESS" );
-      break;
-      case gToDo.ICAL_STATUS_COMPLETED:
-         setFieldValue( "status-field", "ICAL_STATUS_COMPLETED" );
-      break;
       case gToDo.ICAL_STATUS_CANCELLED:
-         setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
+         setFieldValue( "cancelled-checkbox", true, "checked" );
       break;
    }
    
@@ -243,9 +234,7 @@ function onOKCommand()
    
    gToDo.title       = getFieldValue( "title-field" );
    gToDo.description = getFieldValue( "description-field" );
-   if( getFieldValue( "status-field" ) != "" )
-      gToDo.status      = eval( "gToDo."+getFieldValue( "status-field" ) );
-
+   
    var dueDate = getDateTimeFieldValue( "due-date-text" );
    gToDo.due.year = dueDate.getYear()+1900;
    gToDo.due.month = dueDate.getMonth();
@@ -275,6 +264,7 @@ function onOKCommand()
 
    var percentcomplete = getFieldValue( "percent-complete-menulist" );
    percentcomplete =  parseInt( percentcomplete );
+   
    if(percentcomplete > 100)
       percentcomplete = 100;
    else if(percentcomplete < 0)
@@ -293,18 +283,23 @@ function onOKCommand()
       gToDo.status = gToDo.ICAL_STATUS_COMPLETED;
    }
    else
+   {
       gToDo.completed.clear();
-      if (percentcomplete == 0)
-         gToDo.status = gToDo.ICAL_STATUS_NEEDSACTION;
-      else
+      
+      var cancelled = getFieldValue( "cancelled-checkbox", "checked" );
+      
+      if( cancelled )
+         gToDo.status = gToDo.ICAL_STATUS_CANCELLED;
+      else if (percentcomplete > 0)
          gToDo.status = gToDo.ICAL_STATUS_INPROCESS;
-
-
-   dump( "!!!-->in calendarEventDialog.js, alarmUnits is "+gToDo.alarmUnits );
+      else
+         gToDo.status = gToDo.ICAL_STATUS_NEEDSACTION;
+   }
+   
+   
    if ( getFieldValue( "alarm-email-checkbox", "checked" ) ) 
    {
       gToDo.alarmEmailAddress = getFieldValue( "alarm-email-field", "value" );
-      dump( "!!!-->in calendarEventDialog.js, alarmEmailAddress is "+gToDo.alarmEmailAddress );
    }
    else
    {
@@ -627,7 +622,10 @@ function getFieldValue( elementId, propertyName )
    }
    else
    {
-      return field.value;
+      if( field )
+         return field.value;
+      else
+         alert( elementId );
    }
 }
 
diff --git a/calendar/resources/content/toDoDialog.xul b/calendar/resources/content/toDoDialog.xul
index 5fe2309d8f4..cf2c74d470a 100644
--- a/calendar/resources/content/toDoDialog.xul
+++ b/calendar/resources/content/toDoDialog.xul
@@ -249,16 +249,9 @@
                     <!-- Task Status -->
                     <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label value="Event Status"/>
+                            <label value="&newtodo.status.label;"/>
                         </hbox>
-                        <menulist id="status-field" label="&newevent.status.label;">
-                            <menupopup id="status-menulist-menupopup">
-                                <menuitem label="&newevent.status.needsaction.label;"  value="ICAL_STATUS_NEEDSACTION"/>
-										  <menuitem label="&newevent.status.inprogress.label;"  value="ICAL_STATUS_INPROGRESS"/>
-										  <menuitem label="&newevent.status.completed.label;"  value="ICAL_STATUS_COMPLETED"/>
-                                <menuitem label="&newevent.status.cancelled.label;"  value="ICAL_STATUS_CANCELLED"/>
-                            </menupopup>
-                        </menulist>
+                        <checkbox id="cancelled-checkbox"  label="&newtodo.cancelled.label;" checked="false"/>
                     </row>
                     
                     <!-- Categories -->    
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index 7a5b54ccb6c..7149739cb7b 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -111,6 +111,8 @@
 <!ENTITY newtodo.percentcomplete.label "&#37; complete">
 <!ENTITY newtodo.categories.label "Categories">
 <!ENTITY newtodo.starttime.warning "Your start date occurs after your due date.">
+<!ENTITY newtodo.cancelled.label "Cancelled">
+<!ENTITY newtodo.status.label "Status">
 
 <!ENTITY calendar.confirm.deleteevent "Are you sure you want to delete this event titled: " >        
 <!ENTITY calendar.confirm.deleteuntitledevent "Are you sure you want to delete this untitled event?" >