Changeset 175:ae015c7202e1

Show
Ignore:
Timestamp:
11/26/08 03:16:34 (3 years ago)
Author:
cfreeze@…
Branch:
CAP_1.1
Message:

fix email alerts since the CAP 1.1. change

Location:
StormSiren
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • StormSiren/EmailAlertDevice.py

    r122 r175  
    7878 
    7979        def send(self,alert): 
    80                 subject = EMAIL_SUBJECT_LEADER + " - " + alert.event + " (" + alert.area + ")" 
     80                subject = EMAIL_SUBJECT_LEADER + " - " + alert.headline + alert.getAreas() 
    8181                alert_body = "" 
    8282 
  • StormSiren/WeatherAlert.py

    r174 r175  
    6666                str     += " Issued: " + self.issued + "\n" 
    6767                str += "Expires: " + self.expires + "\n" 
     68                str += "Updated: " + self.updated + "\n" 
    6869                return str 
    6970 
    7071        def getDetailedWithFormat(self, desc_width): 
    71                 return self.text + "\n\n" + textwrap.fill(self.description.replace("\n",' '),desc_width) + "\n" 
     72                str = self.text + "\n\n" 
     73                str += textwrap.fill(self.description.replace("\n",' '),desc_width) + "\n" 
     74                return str 
    7275 
    7376        def getDetailed(self): 
    74                 return self.text + "\n\n" + self.description + "\n" 
     77                str = self.text + "\n\n"  
     78                str += self.description + "\n" 
     79                return str 
    7580 
    7681        def getAreas(self):